.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
@@ -278,8 +278,7 @@
return FALSE
var/obj/item/weapon/cell/device/cell = I
user.drop_item(cell)
cell.forceMove(src)
user.drop_from_inventory(cell,src)
battery = cell
playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
to_chat(user, "<span class='notice'>You slot \the [cell] inside \the [src]'s power supply.</span>")
@@ -262,7 +262,7 @@ a creative player the means to solve many problems. Circuits are held inside an
if(!circuit)
return
circuit.loc = null
circuit.loc = assy
circuit.forceMove(assy)
. = 1
update_to_assembly = 1
@@ -41,8 +41,7 @@
to_chat(user, "<span class='warning'>\The [src] is too full to add [O].</span>")
return FALSE
items_contained += O
user.drop_item(O)
O.forceMove(src)
user.drop_from_inventory(O,src)
to_chat(user, "<span class='notice'>You add [O] to \the [src].</span>")
set_pin_data(IC_OUTPUT, 1, TRUE)
return TRUE
@@ -34,10 +34,9 @@
if(installed_gun)
user << "<span class='warning'>There's already a weapon installed.</span>"
return
user.drop_from_inventory(gun)
user.drop_from_inventory(gun,src)
installed_gun = gun
size += gun.w_class
gun.forceMove(src)
user << "<span class='notice'>You slide \the [gun] into the firing mechanism.</span>"
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
else