Replaces a bunch of loc assignments with forcemoves and moves to nullspace

This commit is contained in:
vuonojenmustaturska
2017-12-13 21:56:39 +02:00
committed by CitadelStationBot
parent b03e606d35
commit 7f90427a40
76 changed files with 373 additions and 179 deletions
@@ -102,7 +102,7 @@
for(var/obj/item/I in embedded_objects)
embedded_objects -= I
I.loc = src
I.forceMove(src)
if(!C.has_embedded_objects())
C.clear_alert("embeddedobject")
@@ -151,7 +151,7 @@
if(brainmob)
LB.brainmob = brainmob
brainmob = null
LB.brainmob.loc = LB
LB.brainmob.forceMove(LB)
LB.brainmob.container = LB
LB.brainmob.stat = DEAD
@@ -167,7 +167,7 @@
..()
if(C && !special)
if(C.handcuffed)
C.handcuffed.loc = C.loc
C.handcuffed.forceMove(C.loc)
C.handcuffed.dropped(C)
C.handcuffed = null
C.update_handcuffed()
@@ -185,7 +185,7 @@
..()
if(C && !special)
if(C.handcuffed)
C.handcuffed.loc = C.loc
C.handcuffed.forceMove(C.loc)
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.loc = owner.loc
owner.legcuffed.forceMove(owner.loc)
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.loc = owner.loc
owner.legcuffed.forceMove(owner.loc)
owner.legcuffed.dropped(owner)
owner.legcuffed = null
owner.update_inv_legcuffed()
@@ -306,7 +306,7 @@
if(brain)
if(brainmob)
brainmob.container = null //Reset brainmob head var.
brainmob.loc = brain //Throw mob into brain.
brainmob.forceMove(brain) //Throw mob into brain.
brain.brainmob = brainmob //Set the brain to use the brainmob
brainmob = null //Set head brainmob var to null
brain.Insert(C) //Now insert the brain proper
+2 -2
View File
@@ -41,10 +41,10 @@
user.visible_message("<span class='warning'>[user] saws [src] open and pulls out a brain!</span>", "<span class='notice'>You saw [src] open and pull out a brain.</span>")
if(brainmob)
brainmob.container = null
brainmob.loc = brain
brainmob.forceMove(brain)
brain.brainmob = brainmob
brainmob = null
brain.loc = T
brain.forceMove(T)
brain = null
update_icon_dropped()
else
+1 -1
View File
@@ -118,7 +118,7 @@
var/obj/item/bodypart/L = X
for(var/obj/item/I in L.embedded_objects)
L.embedded_objects -= I
I.loc = T
I.forceMove(T)
clear_alert("embeddedobject")
+1 -1
View File
@@ -176,7 +176,7 @@
"<span class='notice'>You successfully extract [I] from [target]'s [parse_zone(target_zone)].</span>")
add_logs(user, target, "surgically removed [I.name] from", addition="INTENT: [uppertext(user.a_intent)]")
I.Remove(target)
I.loc = get_turf(target)
I.forceMove(get_turf(target))
else
user.visible_message("[user] can't seem to extract anything from [target]'s [parse_zone(target_zone)]!",
"<span class='notice'>You can't extract anything from [target]'s [parse_zone(target_zone)]!</span>")
@@ -28,7 +28,7 @@
owner = M
M.internal_organs |= src
M.internal_organs_slot[slot] = src
loc = null
moveToNullspace()
for(var/X in actions)
var/datum/action/A = X
A.Grant(M)
@@ -26,7 +26,7 @@
var/objects = 0
for(var/obj/item/I in L.embedded_objects)
objects++
I.loc = get_turf(H)
I.forceMove(get_turf(H))
L.embedded_objects -= I
if(!H.has_embedded_objects())
H.clear_alert("embeddedobject")
@@ -39,4 +39,4 @@
else
to_chat(user, "<span class='warning'>You can't find [target]'s [parse_zone(user.zone_selected)], let alone any objects embedded in it!</span>")
return 1
return 1
+1 -1
View File
@@ -212,7 +212,7 @@
add_overlay(img)
add_overlay("evidence")
desc = "An organ storage container holding [I]."
I.loc = src
I.forceMove(src)
w_class = I.w_class
/obj/item/organ_storage/attack_self(mob/user)