Merge pull request #12893 from timothyteakettle/picklefix
pickles don't die until their contents is released
This commit is contained in:
@@ -20,12 +20,12 @@
|
||||
laugher.emote("laugh")
|
||||
|
||||
/mob/living/simple_animal/pickle/death()
|
||||
..()
|
||||
if(original_body)
|
||||
original_body.adjustOrganLoss(ORGAN_SLOT_BRAIN, 200) //to be fair, you have to have a very high iq to understand-
|
||||
original_body.forceMove(get_turf(src))
|
||||
if(mind)
|
||||
mind.transfer_to(original_body)
|
||||
..()
|
||||
|
||||
/mob/living/simple_animal/pickle/wabbajack_act() //restore users name before its used on the new mob
|
||||
if(original_body)
|
||||
|
||||
Reference in New Issue
Block a user