Skip to content

Commit

Permalink
Changeling headslug fixes (#76365)
Browse files Browse the repository at this point in the history
## About The Pull Request

Fixes changelings not actually being put into their headslug
Fixes headslugs not putting their eggs into dead bodies
lowers the time that the headslug actually spawns to a second after a
changeling's body explodes

## Why It's Good For The Game

Bug fixes are good (I died and am mad), last resort is one of the
changeling's cooler abilities
Also the headslug spawning 3 seconds after the changeling exploded
looked terrible, if this was high for a reason let me know and I can
change it back

## Changelog

:cl: Seven
fix: Fixes changelings not being put into their headslug when using last
resort
fix: Fixes changeling headslugs not putting their eggs into dead bodies
/:cl:
  • Loading branch information
Lufferly authored and Gboster-0 committed Feb 17, 2024
1 parent 5b45ef1 commit 0aaa547
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions code/modules/antagonists/changeling/powers/headcrab.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
user.investigate_log("has been gibbed by headslug burst.", INVESTIGATE_DEATHS)
user.gib()
. = TRUE
addtimer(CALLBACK(src, PROC_REF(spawn_headcrab), stored_mind, user_turf, organs), 3 SECONDS)
addtimer(CALLBACK(src, PROC_REF(spawn_headcrab), stored_mind, user_turf, organs), 1 SECONDS)

/datum/action/changeling/headcrab/proc/spawn_headcrab(datum/mind/stored_mind, turf/spawn_location, list/organs)
var/mob/living/basic/headslug/crab = new(spawn_location)
for(var/obj/item/organ/I in organs)
I.forceMove(crab)

stored_mind.transfer_to(crab)
stored_mind.transfer_to(crab, force_key_move = TRUE)
spawn_location.transfer_observers_to(crab)
to_chat(crab, span_warning("You burst out of the remains of your former body in a shower of gore!"))
2 changes: 1 addition & 1 deletion code/modules/mob/living/basic/space_fauna/headslug.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
return

var/mob/living/carbon/victim = target
if(victim.stat == DEAD)
if(victim.stat != DEAD)
return
if(HAS_TRAIT(victim, TRAIT_XENO_HOST))
target.balloon_alert(src, "already pregnant!") // Maybe the worst balloon alert in the codebase
Expand Down

0 comments on commit 0aaa547

Please sign in to comment.