From 2fe6a59489ca07b0b1d3b7d82eea55966f21b4c1 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Wed, 23 May 2018 22:47:29 -0400 Subject: [PATCH] Fix promthean NIF shoving Probably fixes #3746 --- code/modules/nifsoft/nif.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/nifsoft/nif.dm b/code/modules/nifsoft/nif.dm index db6d66e7fd..81d9228bca 100644 --- a/code/modules/nifsoft/nif.dm +++ b/code/modules/nifsoft/nif.dm @@ -580,21 +580,21 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable var/mob/living/carbon/human/U = user var/mob/living/carbon/human/T = M - if(istype(T.species,/datum/species/shapeshifter/promethean) && target_zone == should_be_in) //Are prommy, aimed at head. - if(T.head || T.glasses) - to_chat(user,"Remove any headgear they have on first, as it might interfere.") + if(istype(T.species,/datum/species/shapeshifter/promethean) && target_zone == BP_TORSO) + if(T.w_uniform || T.wear_suit) + to_chat(user,"Remove any clothing they have on, as it might interfere!") return - var/obj/item/organ/external/head = T.get_organ(should_be_in) + var/obj/item/organ/external/eo = T.get_organ(BP_TORSO) if(!T) - to_chat(user,"They should probably regrow their head first.") + to_chat(user,"They should probably regrow their torso first.") return - U.visible_message("[U] begins installing [src] into [T]'s head by just stuffing it in.", - "You begin installing [src] into [T]'s head by just stuffing it in.", + U.visible_message("[U] begins installing [src] into [T]'s chest by just stuffing it in.", + "You begin installing [src] into [T]'s chest by just stuffing it in.", "There's a wet SQUISH noise.") - if(do_mob(user = user, target = T, time = 200, target_zone = should_be_in)) + if(do_mob(user = user, target = T, time = 200, target_zone = BP_TORSO)) user.unEquip(src) - forceMove(head) - head.implants |= src + forceMove(eo) + eo.implants |= src implant(T) playsound(T,'sound/effects/slime_squish.ogg',50,1) else