Skip to content

Defender, Steelcreast and Bulwark no longer keep stances active when stunned/dead and display correct knockdown sprites. #12613

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
Venuska1117 wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Defender, Steelcreast and Bulwark no longer keep stances active when stunned/dead and display correct knockdown sprites. #12613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cf65313
defensive nerf (?)
Venuska1117 Jul 9, 2026
d8fd892
voices had spoken, revert vol removal
Venuska1117 Jul 10, 2026
93f9562
Merge branch 'master' of https://github.com/Venuska1117/cmss13 into n…
Venuska1117 Jul 12, 2026
2e3856d
slight update
Venuska1117 Jul 12, 2026
68c08d9
maybe too harsh?
Venuska1117 Jul 12, 2026
2e906e6
Merge branch 'master' of https://github.com/Venuska1117/cmss13 into n…
Venuska1117 Jul 30, 2026
4b4ef3d
maint req
Venuska1117 Aug 2, 2026
ce5a8cf
Merge branch 'master' of https://github.com/Venuska1117/cmss13 into n…
Venuska1117 Aug 3, 2026
eeb6d1a
Merge branch 'master' into nu2-ex-stun
Venuska1117 Aug 13, 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: 5 additions & 1 deletion code/__DEFINES/traits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,16 @@
#define TRAIT_ABILITY_BURROWED "t_ability_burrowed"
/// Xenos with this trait can toggle long sight while resting.
#define TRAIT_ABILITY_SIGHT_IGNORE_REST "t_ability_sight_ignore_rest"


// -- specific ability traits --
#define TRAIT_ABILITY_CREST "t_ability_crest"
#define TRAIT_ABILITY_FORTIFY "t_ability_fortify"
/// Used by shielder to check stance.
#define TRAIT_ABILITY_ENCLOSED_PLATES "t_ability_enclosed_plates"
/// Used by shielder for reflective plates.
#define TRAIT_ABILITY_REFLECTIVE_PLATES "t_ability_reflective_plates"


//-- item traits --
// TOOL TRAITS
#define TRAIT_TOOL_SCREWDRIVER "t_tool_screwdriver"
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/Evolution.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys)
to_chat(src, SPAN_WARNING("We must be at full health to evolve."))
return FALSE

if(fortify || crest_defense || stealth || HAS_TRAIT(src, TRAIT_ABILITY_ENCLOSED_PLATES) || HAS_TRAIT(src, TRAIT_ABILITY_REFLECTIVE_PLATES))
if(HAS_TRAIT(src, TRAIT_ABILITY_FORTIFY) || HAS_TRAIT(src, TRAIT_ABILITY_CREST) || stealth || HAS_TRAIT(src, TRAIT_ABILITY_ENCLOSED_PLATES) || HAS_TRAIT(src, TRAIT_ABILITY_REFLECTIVE_PLATES))
to_chat(src, SPAN_WARNING("We cannot evolve while in this stance."))
return FALSE

Expand Down Expand Up @@ -326,7 +326,7 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys)
if(tier == 0 || tier == 4)
to_chat(src, SPAN_XENOWARNING("We can't transmute."))
return
if(fortify || crest_defense || stealth)
if(HAS_TRAIT(src, TRAIT_ABILITY_FORTIFY) || HAS_TRAIT(src, TRAIT_ABILITY_CREST) || stealth)
to_chat(src, SPAN_XENOWARNING("We can't transmute while in this stance."))
return
if(lock_evolve)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/XenoAttacks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
//Hot hot Aliens on Aliens action.
//Actually just used for eating people.
/mob/living/carbon/xenomorph/attack_alien(mob/living/carbon/xenomorph/xeno)
if(xeno.fortify || HAS_TRAIT(xeno, TRAIT_ABILITY_BURROWED) || HAS_TRAIT(xeno, TRAIT_ABILITY_REFLECTIVE_PLATES))
if(HAS_TRAIT(xeno, TRAIT_ABILITY_FORTIFY) || HAS_TRAIT(xeno, TRAIT_ABILITY_BURROWED) || HAS_TRAIT(xeno, TRAIT_ABILITY_REFLECTIVE_PLATES))
return XENO_NO_DELAY_ACTION

if(HAS_TRAIT(src, TRAIT_ABILITY_BURROWED))
Expand Down
2 changes: 0 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,6 @@
var/tunnel = FALSE
/// for check on lurker invisibility
var/stealth = FALSE
var/fortify = FALSE
var/crest_defense = FALSE
/// For drones/hivelords. Extends the maximum build range they have
var/extra_build_dist = 0
/// tiles from self you can plant eggs.
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,15 @@
to_chat(src, SPAN_WARNING("No time to rest, must KILL!"))
return

if(fortify)
if(HAS_TRAIT(src, TRAIT_ABILITY_FORTIFY))
to_chat(src, SPAN_WARNING("We cannot rest while fortified!"))
return

if(HAS_TRAIT(src, TRAIT_ABILITY_BURROWED))
to_chat(src, SPAN_WARNING("We cannot rest while burrowed!"))
return

if(crest_defense)
if(HAS_TRAIT(src, TRAIT_ABILITY_CREST))
to_chat(src, SPAN_WARNING("We cannot rest while our crest is down!"))
return

Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/attack_alien.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// this proc could use refactoring at some point
/mob/living/carbon/human/attack_alien(mob/living/carbon/xenomorph/attacking_xeno, dam_bonus, unblockable = FALSE)
if(attacking_xeno.fortify || HAS_TRAIT(attacking_xeno, TRAIT_ABILITY_BURROWED) || HAS_TRAIT(attacking_xeno, TRAIT_ABILITY_REFLECTIVE_PLATES))
if(HAS_TRAIT(attacking_xeno, TRAIT_ABILITY_FORTIFY) || HAS_TRAIT(attacking_xeno, TRAIT_ABILITY_BURROWED) || HAS_TRAIT(attacking_xeno, TRAIT_ABILITY_REFLECTIVE_PLATES))
return XENO_NO_DELAY_ACTION

if(HAS_TRAIT(src, TRAIT_HAULED))
Expand Down Expand Up @@ -253,7 +253,7 @@

//Every other type of nonhuman mob
/mob/living/attack_alien(mob/living/carbon/xenomorph/xeno)
if(xeno.fortify || HAS_TRAIT(xeno, TRAIT_ABILITY_BURROWED))
if(HAS_TRAIT(xeno, TRAIT_ABILITY_FORTIFY) || HAS_TRAIT(xeno, TRAIT_ABILITY_BURROWED))
return XENO_NO_DELAY_ACTION

switch(xeno.a_intent)
Expand Down
Loading