Merge pull request #34187 from ShizCalev/butcher-droplocation
Switches butchering/gib drops to use drop_location
This commit is contained in:
@@ -82,7 +82,7 @@
|
||||
/obj/item/bodypart/proc/drop_limb(special)
|
||||
if(!owner)
|
||||
return
|
||||
var/turf/T = get_turf(owner)
|
||||
var/atom/Tsec = owner.drop_location()
|
||||
var/mob/living/carbon/C = owner
|
||||
update_limb(1)
|
||||
C.bodyparts -= src
|
||||
@@ -126,7 +126,7 @@
|
||||
C.update_hair()
|
||||
C.update_canmove()
|
||||
|
||||
if(!T) // T = null happens when a "dummy human" used for rendering icons on prefs screen gets its limbs replaced.
|
||||
if(!Tsec) // Tsec = null happens when a "dummy human" used for rendering icons on prefs screen gets its limbs replaced.
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
@@ -135,7 +135,7 @@
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
forceMove(T)
|
||||
forceMove(Tsec)
|
||||
|
||||
|
||||
|
||||
@@ -167,7 +167,7 @@
|
||||
..()
|
||||
if(C && !special)
|
||||
if(C.handcuffed)
|
||||
C.handcuffed.forceMove(C.loc)
|
||||
C.handcuffed.forceMove(drop_location())
|
||||
C.handcuffed.dropped(C)
|
||||
C.handcuffed = null
|
||||
C.update_handcuffed()
|
||||
@@ -185,7 +185,7 @@
|
||||
..()
|
||||
if(C && !special)
|
||||
if(C.handcuffed)
|
||||
C.handcuffed.forceMove(C.loc)
|
||||
C.handcuffed.forceMove(drop_location())
|
||||
C.handcuffed.dropped(C)
|
||||
C.handcuffed = null
|
||||
C.update_handcuffed()
|
||||
@@ -201,7 +201,7 @@
|
||||
/obj/item/bodypart/r_leg/drop_limb(special)
|
||||
if(owner && !special)
|
||||
if(owner.legcuffed)
|
||||
owner.legcuffed.forceMove(owner.loc)
|
||||
owner.legcuffed.forceMove(drop_location())
|
||||
owner.legcuffed.dropped(owner)
|
||||
owner.legcuffed = null
|
||||
owner.update_inv_legcuffed()
|
||||
@@ -212,7 +212,7 @@
|
||||
/obj/item/bodypart/l_leg/drop_limb(special) //copypasta
|
||||
if(owner && !special)
|
||||
if(owner.legcuffed)
|
||||
owner.legcuffed.forceMove(owner.loc)
|
||||
owner.legcuffed.forceMove(drop_location())
|
||||
owner.legcuffed.dropped(owner)
|
||||
owner.legcuffed = null
|
||||
owner.update_inv_legcuffed()
|
||||
|
||||
Reference in New Issue
Block a user