cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

POLARIS: Dropped limbs go into the drop location of the victim

Browse Source
This commit is contained in:
Arokha Sieyes
2018-03-18 20:10:08 -04:00
parent deac68004d
commit decfbef934
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/organs/organ_external.dm
View File

@@ -891,6 +891,7 @@ Note that amputating the affected organ does in fact remove the infection from t
victim.update_icons_body() victim.update_icons_body()
dir = 2 dir = 2
var/atom/droploc = victim.drop_location()
switch(disintegrate) switch(disintegrate)
if(DROPLIMB_EDGE) if(DROPLIMB_EDGE)
appearance_flags &= ~PIXEL_SCALE 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) throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)
dir = 2 dir = 2
if(DROPLIMB_BURN) 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) for(var/obj/item/I in src)
if(I.w_class > ITEMSIZE_SMALL && !istype(I,/obj/item/organ)) if(I.w_class > ITEMSIZE_SMALL && !istype(I,/obj/item/organ))
I.loc = get_turf(src) I.forceMove(droploc)
qdel(src) qdel(src)
if(DROPLIMB_BLUNT) if(DROPLIMB_BLUNT)
var/obj/effect/decal/cleanable/blood/gibs/gore var/obj/effect/decal/cleanable/blood/gibs/gore
if(robotic >= ORGAN_ROBOT) 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 else
gore = new /obj/effect/decal/cleanable/blood/gibs(get_turf(victim)) gore = new /obj/effect/decal/cleanable/blood/gibs(droploc)
if(species) if(species)
gore.fleshcolor = use_flesh_colour gore.fleshcolor = use_flesh_colour
gore.basecolor = use_blood_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) if(I.w_class <= ITEMSIZE_SMALL)
qdel(I) qdel(I)
continue continue
I.loc = get_turf(src) I.forceMove(droploc)
I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5) I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)
qdel(src) qdel(src)