cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced loc setting with forceMove. (#11490)

Browse Source 
* Replaced loc setting with forceMove.

* Update forceMove to permit moving to null loc.

Also fixed atom locking with offsets not following properly.
This commit is contained in:
ComicIronic
2016-08-29 12:40:45 +01:00
committed by clusterfack
parent b0e22029ab
commit b35eaa65d8
348 changed files with 1019 additions and 1016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/research/mechanic/flatpack.dm
View File

@@ -88,10 +88,10 @@
return
/obj/structure/closet/crate/flatpack/proc/Finalize()
machine.loc = get_turf(src)
machine.forceMove(get_turf(src))
machine.RefreshParts()
for(var/atom/movable/AM in src)
AM.loc = get_turf(src)
AM.forceMove(get_turf(src))
qdel(src)
/obj/structure/closet/crate/flatpack/attack_hand(mob/user, params)
@@ -157,7 +157,7 @@
if(!flatpack)
return
flatpack.loc = src
flatpack.forceMove(src)
var/image/flatimage = image(flatpack.icon, icon_state = flatpack.icon_state)

4
code/modules/research/mechanic/flatpacker.dm
View File

@@ -64,12 +64,12 @@
src.overlays -= image(icon = icon, icon_state = "[base_state]_ani")
if(being_built)
var/obj/structure/closet/crate/flatpack/FP = new
being_built.loc = FP
being_built.forceMove(FP)
FP.name += " ([being_built.name])"
FP.machine = being_built
FP.update_icon()
var/turf/output = get_output()
FP.loc = get_turf(output)
FP.forceMove(get_turf(output))
src.visible_message("[bicon(src)] \The [src] beeps: \"Succesfully completed \the [being_built.name].\"")
src.being_built = null