Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Stuns do not affect tail wagging, but paralyzes still do #13363

Closed
Sniblet wants to merge 8 commits into from
Closed

Stuns do not affect tail wagging, but paralyzes still do #13363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b9eb1f0
Update species.dm
Sniblet Mar 2, 2022
6dcfdc4
is it this simple
Sniblet Mar 2, 2022
0b8aa05
Merge branch 'yogstation13:master' into Not-over
Sniblet Mar 3, 2022
ee26929
it's not this simple
Sniblet Mar 3, 2022
129a28b
maybe this is part of it
Sniblet Mar 3, 2022
232a56f
I'm dying
Sniblet Mar 3, 2022
bc328a9
what he said
Sniblet Mar 3, 2022
7633820
Merge branch 'yogstation13:master' into Not-over
Sniblet Mar 3, 2022
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
3 changes: 1 addition & 2 deletions code/modules/mob/living/carbon/human/species.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1969,7 +1969,6 @@ GLOBAL_LIST_EMPTY(mentor_races)
ToggleFlight(H)
flyslip(H)
. = stunmod * H.physiology.stun_mod * amount
stop_wagging_tail(H)

//////////////
//Space Move//
Expand All @@ -1990,7 +1989,7 @@ GLOBAL_LIST_EMPTY(mentor_races)
////////////////

/datum/species/proc/can_wag_tail(mob/living/carbon/human/H)
if(H.IsParalyzed() || H.IsStun())
if(H.IsParalyzed())
return FALSE
return (H.getorganslot(ORGAN_SLOT_TAIL))

Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/human/status_procs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

/mob/living/carbon/human/Paralyze(amount, updating = TRUE, ignore_canstun = FALSE)
amount = dna.species.spec_stun(src, amount)
Copy link
Contributor

@nmajask nmajask Mar 13, 2022

Choose a reason for hiding this comment

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

Suggested change
amount = dna.species.spec_stun(src, amount)
if(!dna || !dna.species)
return ..()
amount = dna.species.spec_stun(src, amount)

Add a check to make sure dna and dna.species aren't null

dna.species.stop_wagging_tail(src)
return ..()

/mob/living/carbon/human/Immobilize(amount, updating = TRUE, ignore_canstun = FALSE)
Expand Down