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
+1 -2
View File
@@ -47,10 +47,9 @@
/obj/structure/filingcabinet/attackby(obj/item/P, mob/user, params)
if(istype(P, /obj/item/paper) || istype(P, /obj/item/folder) || istype(P, /obj/item/photo) || istype(P, /obj/item/documents))
if(!user.drop_item())
if(!user.transferItemToLoc(P, src))
return
to_chat(user, "<span class='notice'>You put [P] in [src].</span>")
P.loc = src
icon_state = "[initial(icon_state)]-open"
sleep(5)
icon_state = initial(icon_state)
+2 -3
View File
@@ -44,16 +44,15 @@
/obj/item/papercutter/attackby(obj/item/P, mob/user, params)
if(istype(P, /obj/item/paper) && !storedpaper)
if(!user.drop_item())
if(!user.transferItemToLoc(P, src))
return
playsound(loc, "pageturn", 60, 1)
to_chat(user, "<span class='notice'>You place [P] in [src].</span>")
P.loc = src
storedpaper = P
update_icon()
return
if(istype(P, /obj/item/hatchet/cutterblade) && !storedcutter)
if(!user.drop_item())
if(!user.transferItemToLoc(P, src))
return
to_chat(user, "<span class='notice'>You replace [src]'s [P].</span>")
P.loc = src
+5 -5
View File
@@ -240,7 +240,7 @@
updateUsrDialog()
/obj/machinery/photocopier/proc/do_insertion(obj/item/O, mob/user)
O.loc = src
O.forceMove(src)
to_chat(user, "<span class ='notice'>You insert [O] into [src].</span>")
flick("photocopier1", src)
updateUsrDialog()
@@ -261,7 +261,7 @@
resistance_flags |= FLAMMABLE
fire_act()
else
if(!user.drop_item())
if(!user.temporarilyRemoveItemFromInventory(O))
return
copy = O
do_insertion(O, user)
@@ -270,7 +270,7 @@
else if(istype(O, /obj/item/photo))
if(copier_empty())
if(!user.drop_item())
if(!user.temporarilyRemoveItemFromInventory(O))
return
photocopy = O
do_insertion(O, user)
@@ -279,7 +279,7 @@
else if(istype(O, /obj/item/documents))
if(copier_empty())
if(!user.drop_item())
if(!user.temporarilyRemoveItemFromInventory(O))
return
doccopy = O
do_insertion(O, user)
@@ -288,7 +288,7 @@
else if(istype(O, /obj/item/device/toner))
if(toner <= 0)
if(!user.drop_item())
if(!user.temporarilyRemoveItemFromInventory(O))
return
qdel(O)
toner = 40