.loc = to forceMove() (#4937)

As requested, this PR is changed to only include all .loc = to forceMove() changes.
This commit is contained in:
BurgerLUA
2018-08-04 01:48:58 +03:00
committed by Erki
parent 187613428e
commit 8519dcc393
376 changed files with 968 additions and 1261 deletions
+4 -3
View File
@@ -30,11 +30,11 @@
user << "<span class='notice'>You disassemble [src].</span>"
bombassembly.loc = user.loc
bombassembly.forceMove(user.loc)
bombassembly.master = null
bombassembly = null
bombtank.loc = user.loc
bombtank.forceMove(user.loc)
bombtank.master = null
bombtank = null
@@ -84,13 +84,14 @@
var/obj/item/device/onetankbomb/R = new /obj/item/device/onetankbomb(loc)
//this is really bad code, TODO: Make it better
M.drop_item() //Remove the assembly from your hands
M.remove_from_mob(src) //Remove the tank from your character,in case you were holding it
M.put_in_hands(R) //Equips the bomb if possible, or puts it on the floor.
R.bombassembly = S //Tell the bomb about its assembly part
S.master = R //Tell the assembly about its new owner
S.loc = R //Move the assembly out of the fucking way
S.forceMove(R) //Move the assembly out of the fucking way
R.bombtank = src //Same for tank
master = R
+4 -4
View File
@@ -40,8 +40,8 @@
user.remove_from_mob(D2)
D:holder = src
D2:holder = src
D.loc = src
D2.loc = src
D.forceMove(src)
D2.forceMove(src)
a_left = D
a_right = D2
name = "[D.name]-[D2.name] assembly"
@@ -185,10 +185,10 @@
if(!T) return 0
if(a_left)
a_left:holder = null
a_left.loc = T
a_left.forceMove(T)
if(a_right)
a_right:holder = null
a_right.loc = T
a_right.forceMove(T)
QDEL_IN(src, 0)
return
+2 -2
View File
@@ -19,8 +19,8 @@
var/turf/T = loc
if(ismob(T))
T = T.loc
part1.loc = T
part2.loc = T
part1.forceMove(T)
part2.forceMove(T)
part1.master = null
part2.master = null
part1 = null