Skip to content

Goblins get to be Knight, Sargent, and Orthodoxist #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheTrueSilverRat wants to merge 5 commits into
base: main
Choose a base branch
from
+32 −14
Open

Goblins get to be Knight, Sargent, and Orthodoxist #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c5f6b6e
Refactored Fall impact code
TheTrueSilverRat Jan 31, 2026
d895bc9
Merge branch 'main' of https://github.com/TheTrueSilverRat/Emerald-Su…
TheTrueSilverRat Feb 25, 2026
0b0d1b1
Merge remote-tracking branch 'upstream/main'
TheTrueSilverRat Feb 26, 2026
ab23e37
test
TheTrueSilverRat Feb 25, 2026
09db80f
Fixed the issues of fucking with races
TheTrueSilverRat Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions code/__DEFINES/roguetown.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@ Balloon Alert / Floating Text defines

#define RACES_NOBILITY_ELIGIBLE_UP list(RACES_NOBILITY_ELIGIBLE)

#define RACES_KNIGHT list(RACES_NOBILITY_ELIGIBLE, /datum/species/goblinp)

#define RACES_CHURCH_FAVORED_UP list(RACES_NOBILITY_ELIGIBLE, RACES_CHURCH_FAVORED)

#define RACES_CHURCH_FAVORED_UP_PLUS_WILDKIN list(RACES_NOBILITY_ELIGIBLE, RACES_CHURCH_FAVORED, RACES_WILDKIN)
Expand All @@ -272,6 +274,10 @@ Balloon Alert / Floating Text defines

#define RACES_NO_GOLEM list(RACES_NOBILITY_ELIGIBLE, RACES_CHURCH_FAVORED, RACES_APPOINTED_OUTCASTS, RACES_SECOND_CLASS, RACES_FEARED, RACES_WIDELY_REVILED)

#define RACES_ORTHODOXIST list(RACES_NOBILITY_ELIGIBLE, RACES_CHURCH_FAVORED, RACES_APPOINTED_OUTCASTS, RACES_MANMADE, RACES_SECOND_CLASS, RACES_FEARED, /datum/species/goblinp)

#define RACES_SARGE list(RACES_NOBILITY_ELIGIBLE, RACES_CHURCH_FAVORED, RACES_APPOINTED_OUTCASTS, RACES_MANMADE, RACES_SECOND_CLASS, RACES_FEARED, /datum/species/goblinp)

#define NOBLE_RACES_TYPES list(\
/datum/species/human/northern,\
/datum/species/human/halfelf,\
Expand Down
10 changes: 8 additions & 2 deletions code/game/turfs/turf.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,14 @@
return
if(zFall(A, ++levels))
return FALSE
if(!HAS_TRAIT(A, TRAIT_NOFALLDAMAGE1) && !HAS_TRAIT(A, TRAIT_NOFALLDAMAGE2))
A.visible_message(span_danger("[A] crashes into [src]!"))
if(isliving(A))
var/mob/living/O = A
var/dex_save = O.get_skill_level(/datum/skill/misc/climbing)
if( levels <= 3 && (dex_save >= 5 || HAS_TRAIT(A, TRAIT_NOFALLDAMAGE1) || HAS_TRAIT(A, TRAIT_NOFALLDAMAGE2)))
if(O.m_intent != MOVE_INTENT_SNEAK) // If we're sneaking, don't show a message to anybody, shhh!
O.visible_message("<span class='danger'>[A] gracefully lands on top of [src]!</span>")
else
A.visible_message("<span class='danger'>[A] crashes into [src]!</span>")
Copy link
Contributor

@quantum-bitz quantum-bitz Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like another commit got added when you rebased. Can you remove this?

Copy link
Contributor

@atomicplan666 atomicplan666 Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TheTrueSilverRat

else
A.visible_message(span_warning("[A] lands on [src]!"))
A.onZImpact(src, levels)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roguetown/Inquisition/orthodoxist.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
faction = "Station"
total_positions = 3 // THREE GOONS!!
spawn_positions = 3
allowed_races = RACES_SECOND_CLASS_UP
allowed_races = RACES_ORTHODOXIST
allowed_patrons = list(/datum/patron/old_god) //You MUST have a Psydonite character to start. Just so people don't get japed into Oops Suddenly Psydon!
tutorial = "Whether hand-picked by the Sovereignty of Otava or taken along through mere circumstance, you now serve as a loyal adherent to the Inquisitor's retinue. Descend into the darkness and - be it with a clenched fist or an opened palm - bring the inhumen towards the light: gift them salvation or damnation."
selection_color = JCOLOR_INQUISITION
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roguetown/garrison/sergeant.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
total_positions = 1
spawn_positions = 1
allowed_sexes = list(MALE, FEMALE)
allowed_races = RACES_FEARED_UP//Identical to MAA.
allowed_races = RACES_SARGE
allowed_ages = list(AGE_ADULT, AGE_MIDDLEAGED, AGE_OLD)
tutorial = "You are the most experienced of the Crown's Soldiery, leading the men-at-arms in maintaining order and attending to threats and crimes below the court's attention. \
See to those under your command and fill in the gaps knights leave in their wake. Obey the orders of your Marshal and the Crown."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roguetown/nobility/knight.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
faction = "Station"
total_positions = 4
spawn_positions = 4
allowed_races = RACES_NOBILITY_ELIGIBLE_UP
allowed_races = RACES_KNIGHT
allowed_sexes = list(MALE, FEMALE)
allowed_ages = list(AGE_ADULT, AGE_MIDDLEAGED)
tutorial = "Having proven yourself both loyal and capable, you have been knighted to serve the realm as the royal family's sentry. \
Expand Down
24 changes: 15 additions & 9 deletions code/modules/mob/living/living.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,28 @@
if(HAS_TRAIT(src, TRAIT_NOFALLDAMAGE2))
return
if(HAS_TRAIT(src, TRAIT_NOFALLDAMAGE1))
if(levels <= 2)
Immobilize(10)
if(m_intent == MOVE_INTENT_RUN)
toggle_rogmove_intent(MOVE_INTENT_WALK)
if(levels <= 3)
return
var/dex_save = src.get_skill_level(/datum/skill/misc/climbing)
var/sneak_fall = FALSE // If we're sneaking, don't announce it to our surroundings
if(dex_save >= 5) // Master climbers can fall down 2 levels without hurting themselves
if(levels <= 3)
to_chat(src, "<span class='info'>My dexterity allowed me to land on my feet unscathed!</span>")
if(src.m_intent != MOVE_INTENT_SNEAK) // If we're sneaking, don't make a sound
sneak_fall = TRUE
playsound(src.loc, 'sound/foley/bodyfall (1).ogg', 100, FALSE)
return
var/points
for(var/i in 2 to levels)
i++
points += "!"
visible_message(span_danger("[src] falls down[points]"), \
span_danger("I fall down[points]"))
if(!isgroundlessturf(T))
if(!sneak_fall)
visible_message("<span class='danger'>[src] falls down[points]</span>", \
"<span class='danger'>I fall down[points]</span>")
playsound(src.loc, 'sound/foley/zfall.ogg', 100, FALSE)
if(!isgroundlessturf(T))
ZImpactDamage(T, levels)
drop_all_held_items()
record_round_statistic(STATS_MOAT_FALLERS)// Wouldn't this only count if you DIDN'T fall in the moat?
record_round_statistic(STATS_MOAT_FALLERS)
return ..()

/mob/living/proc/ZImpactDamage(turf/T, levels)
Expand Down
Loading