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
+1 -1
View File
@@ -110,7 +110,7 @@
if(istype(inserted_id))
if(href_list["choice"] == "eject")
to_chat(usr, "<span class='notice'>You eject the ID from [src]'s card slot.</span>")
inserted_id.loc = loc
inserted_id.forceMove(loc)
inserted_id.verb_pickup()
inserted_id = null
else if(href_list["choice"] == "insert")
+3 -3
View File
@@ -132,11 +132,11 @@
/mob/living/simple_animal/hostile/mining_drone/proc/CollectOre()
var/obj/item/ore/O
for(O in src.loc)
O.loc = src
O.forceMove(src)
for(var/dir in GLOB.alldirs)
var/turf/T = get_step(src,dir)
for(O in T)
O.loc = src
O.forceMove(src)
return
/mob/living/simple_animal/hostile/mining_drone/proc/DropOre(message = 1)
@@ -148,7 +148,7 @@
to_chat(src, "<span class='notice'>You dump your stored ore.</span>")
for(var/obj/item/ore/O in contents)
contents -= O
O.loc = src.loc
O.forceMove(drop_location())
return
/mob/living/simple_animal/hostile/mining_drone/adjustHealth(amount)
+1 -1
View File
@@ -100,4 +100,4 @@
if(!M)
M = new /obj/item/storage/bag/money(src)
unload_mineral(M)
O.loc = M
O.forceMove(M)