From decfbef9341957ff2dab2a2bd58a3956532cf4cc Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sun, 18 Mar 2018 20:10:08 -0400 Subject: [PATCH] POLARIS: Dropped limbs go into the drop location of the victim --- code/modules/organs/organ_external.dm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 8ffe98377e..21b642c525 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -891,6 +891,7 @@ Note that amputating the affected organ does in fact remove the infection from t victim.update_icons_body() dir = 2 + var/atom/droploc = victim.drop_location() switch(disintegrate) if(DROPLIMB_EDGE) appearance_flags &= ~PIXEL_SCALE @@ -905,17 +906,17 @@ Note that amputating the affected organ does in fact remove the infection from t throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5) dir = 2 if(DROPLIMB_BURN) - new /obj/effect/decal/cleanable/ash(get_turf(victim)) + new /obj/effect/decal/cleanable/ash(droploc) for(var/obj/item/I in src) if(I.w_class > ITEMSIZE_SMALL && !istype(I,/obj/item/organ)) - I.loc = get_turf(src) + I.forceMove(droploc) qdel(src) if(DROPLIMB_BLUNT) var/obj/effect/decal/cleanable/blood/gibs/gore if(robotic >= ORGAN_ROBOT) - gore = new /obj/effect/decal/cleanable/blood/gibs/robot(get_turf(victim)) + gore = new /obj/effect/decal/cleanable/blood/gibs/robot(droploc) else - gore = new /obj/effect/decal/cleanable/blood/gibs(get_turf(victim)) + gore = new /obj/effect/decal/cleanable/blood/gibs(droploc) if(species) gore.fleshcolor = use_flesh_colour gore.basecolor = use_blood_colour @@ -932,7 +933,7 @@ Note that amputating the affected organ does in fact remove the infection from t if(I.w_class <= ITEMSIZE_SMALL) qdel(I) continue - I.loc = get_turf(src) + I.forceMove(droploc) I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5) qdel(src)