Remove drop_item, drop_item_v, put_in_hands_or_del

This commit is contained in:
Jordan Brown
2017-10-07 13:36:33 -04:00
committed by CitadelStationBot
parent 5f4b3594d0
commit 075cb673c0
152 changed files with 1778 additions and 425 deletions
@@ -43,12 +43,11 @@ Note: Must be placed within 3 tiles of the R&D Console
if (temp_tech.len == 0)
to_chat(user, "<span class='warning'>You cannot deconstruct this item!</span>")
return
if(!user.drop_item())
if(!user.transferItemToLoc(O, src))
to_chat(user, "<span class='warning'>\The [O] is stuck to your hand, you cannot put it in the [src.name]!</span>")
return
busy = TRUE
loaded_item = O
O.forceMove(src)
to_chat(user, "<span class='notice'>You add the [O.name] to the [src.name]!</span>")
flick("d_analyzer_la", src)
addtimer(CALLBACK(src, .proc/finish_loading), 10)
+1 -2
View File
@@ -122,10 +122,9 @@
if (temp_tech.len == 0)
to_chat(user, "<span class='warning'>You cannot experiment on this item!</span>")
return
if(!user.drop_item())
if(!user.transferItemToLoc(O, src))
return
loaded_item = O
O.loc = src
to_chat(user, "<span class='notice'>You add the [O.name] to the machine.</span>")
flick("h_lathe_load", src)
+1 -2
View File
@@ -127,9 +127,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
else
to_chat(user, "<span class='danger'>Machine cannot accept disks in that format.</span>")
return
if(!user.drop_item())
if(!user.transferItemToLoc(D, src))
return
D.loc = src
to_chat(user, "<span class='notice'>You add the disk to the machine!</span>")
else if(!(linked_destroy && linked_destroy.busy) && !(linked_lathe && linked_lathe.busy) && !(linked_imprinter && linked_imprinter.busy))
. = ..()
@@ -70,7 +70,6 @@
if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
monkeys++
to_chat(user, "<span class='notice'>You feed [O] to [src]. It now has [monkeys] monkey cubes stored.</span>")
user.drop_item()
qdel(O)
return
else if(istype(O, /obj/item/storage/bag))