mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-22 05:17:38 +01:00
.loc = to forceMove() (#4937)
As requested, this PR is changed to only include all .loc = to forceMove() changes.
This commit is contained in:
@@ -96,7 +96,7 @@
|
||||
removable_objects |= I
|
||||
if(removable_objects.len)
|
||||
var/obj/item/I = pick(removable_objects)
|
||||
I.loc = get_turf(user) //just in case something was embedded that is not an item
|
||||
I.forceMove(get_turf(user)) //just in case something was embedded that is not an item
|
||||
if(istype(I))
|
||||
if(!(user.l_hand && user.r_hand))
|
||||
user.put_in_hands(I)
|
||||
@@ -129,7 +129,7 @@
|
||||
if(istype(W,/obj/item/weapon/hemostat))
|
||||
if(contents.len)
|
||||
var/obj/item/removing = pick(contents)
|
||||
removing.loc = get_turf(user.loc)
|
||||
removing.forceMove(get_turf(user.loc))
|
||||
if(!(user.l_hand && user.r_hand))
|
||||
user.put_in_hands(removing)
|
||||
user.visible_message("<span class='danger'><b>[user]</b> extracts [removing] from [src] with [W]!</span>")
|
||||
@@ -395,7 +395,7 @@ This function completely restores a damaged organ to perfect condition.
|
||||
// remove embedded objects and drop them on the floor
|
||||
for(var/obj/implanted_object in implants)
|
||||
if(!istype(implanted_object,/obj/item/weapon/implant)) // We don't want to remove REAL implants. Just shrapnel etc.
|
||||
implanted_object.loc = owner.loc
|
||||
implanted_object.forceMove(owner.loc)
|
||||
implants -= implanted_object
|
||||
|
||||
owner.updatehealth()
|
||||
@@ -805,7 +805,7 @@ Note that amputating the affected organ does in fact remove the infection from t
|
||||
new /obj/effect/decal/cleanable/ash(get_turf(victim))
|
||||
for(var/obj/item/I in src)
|
||||
if(I.w_class > 2 && !istype(I,/obj/item/organ))
|
||||
I.loc = get_turf(src)
|
||||
I.forceMove(get_turf(src))
|
||||
qdel(src)
|
||||
if(DROPLIMB_BLUNT)
|
||||
var/obj/effect/decal/cleanable/blood/gibs/gore = new victim.species.single_gib_type(get_turf(victim))
|
||||
@@ -1034,8 +1034,9 @@ Note that amputating the affected organ does in fact remove the infection from t
|
||||
W.add_blood(owner)
|
||||
if(ismob(W.loc))
|
||||
var/mob/living/H = W.loc
|
||||
H.drop_from_inventory(W)
|
||||
W.loc = owner
|
||||
H.drop_from_inventory(W,owner)
|
||||
else
|
||||
W.forceMove(owner)
|
||||
|
||||
/obj/item/organ/external/removed(var/mob/living/user, var/ignore_children = 0)
|
||||
|
||||
@@ -1052,9 +1053,9 @@ Note that amputating the affected organ does in fact remove the infection from t
|
||||
//large items and non-item objs fall to the floor, everything else stays
|
||||
var/obj/item/I = implant
|
||||
if(istype(I) && I.w_class < 3)
|
||||
implant.loc = get_turf(victim.loc)
|
||||
implant.forceMove(get_turf(victim.loc))
|
||||
else
|
||||
implant.loc = src
|
||||
implant.forceMove(src)
|
||||
implants.Cut()
|
||||
|
||||
// Attached organs also fly off.
|
||||
@@ -1062,14 +1063,14 @@ Note that amputating the affected organ does in fact remove the infection from t
|
||||
for(var/obj/item/organ/external/O in children)
|
||||
O.removed()
|
||||
if(O)
|
||||
O.loc = src
|
||||
O.forceMove(src)
|
||||
for(var/obj/item/I in O.contents)
|
||||
I.loc = src
|
||||
I.forceMove(src)
|
||||
|
||||
// Grab all the internal giblets too.
|
||||
for(var/obj/item/organ/organ in internal_organs)
|
||||
organ.removed()
|
||||
organ.loc = src
|
||||
organ.forceMove(src)
|
||||
|
||||
// Remove parent references
|
||||
parent.children -= src
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
/obj/item/organ/mmi_holder/removed(var/mob/living/user)
|
||||
|
||||
if(stored_mmi)
|
||||
stored_mmi.loc = get_turf(src)
|
||||
stored_mmi.forceMove(get_turf(src))
|
||||
if(owner.mind)
|
||||
owner.mind.transfer_to(stored_mmi.brainmob)
|
||||
. = ..()
|
||||
@@ -149,7 +149,7 @@
|
||||
stored_mmi.icon_state = "posibrain-occupied"
|
||||
update_from_mmi()
|
||||
else
|
||||
stored_mmi.loc = get_turf(src)
|
||||
stored_mmi.forceMove(get_turf(src))
|
||||
qdel(src)
|
||||
|
||||
//////////////
|
||||
|
||||
@@ -96,7 +96,8 @@
|
||||
maim_bonus = 1
|
||||
|
||||
/obj/item/organ/external/foot/removed()
|
||||
if(owner) owner.drop_from_inventory(owner.shoes)
|
||||
if(owner)
|
||||
owner.drop_from_inventory(owner.shoes)
|
||||
..()
|
||||
|
||||
/obj/item/organ/external/foot/right
|
||||
|
||||
Reference in New Issue
Block a user