Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176

[MIRROR] loc -- > forcemove
This commit is contained in:
LetterJay
2017-11-14 15:58:20 -06:00
committed by GitHub
18 changed files with 243 additions and 258 deletions
+11 -11
View File
@@ -167,7 +167,7 @@
if(mmi && mind)//Safety for when a cyborg gets dust()ed. Or there is no MMI inside.
var/turf/T = get_turf(loc)//To hopefully prevent run time errors.
if(T)
mmi.loc = T
mmi.forceMove(T)
if(mmi.brainmob)
if(mmi.brainmob.stat == DEAD)
mmi.brainmob.stat = CONSCIOUS
@@ -770,24 +770,24 @@
/mob/living/silicon/robot/proc/deconstruct()
var/turf/T = get_turf(src)
if (robot_suit)
robot_suit.loc = T
robot_suit.l_leg.loc = T
robot_suit.forceMove(T)
robot_suit.l_leg.forceMove(T)
robot_suit.l_leg = null
robot_suit.r_leg.loc = T
robot_suit.r_leg.forceMove(T)
robot_suit.r_leg = null
new /obj/item/stack/cable_coil(T, robot_suit.chest.wired)
robot_suit.chest.loc = T
robot_suit.chest.forceMove(T)
robot_suit.chest.wired = 0
robot_suit.chest = null
robot_suit.l_arm.loc = T
robot_suit.l_arm.forceMove(T)
robot_suit.l_arm = null
robot_suit.r_arm.loc = T
robot_suit.r_arm.forceMove(T)
robot_suit.r_arm = null
robot_suit.head.loc = T
robot_suit.head.flash1.loc = T
robot_suit.head.forceMove(T)
robot_suit.head.flash1.forceMove(T)
robot_suit.head.flash1.burn_out()
robot_suit.head.flash1 = null
robot_suit.head.flash2.loc = T
robot_suit.head.flash2.forceMove(T)
robot_suit.head.flash2.burn_out()
robot_suit.head.flash2 = null
robot_suit.head = null
@@ -806,7 +806,7 @@
var/obj/item/device/assembly/flash/handheld/F = new /obj/item/device/assembly/flash/handheld(T)
F.burn_out()
if (cell) //Sanity check.
cell.loc = T
cell.forceMove(T)
cell = null
qdel(src)