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

drop_item and click code.

Browse Source 
drop_item now has a first arg, which is the item to drop.
Hand processing now uses drop_item properly, which fixes #3874, #3796.
Also fixes #3486.
This commit is contained in:
ComicIronic
2015-04-12 00:56:43 +01:00
parent 1e25ea379f
commit d0e9eedd25
195 changed files with 372 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/library/lib_items.dm
View File

@@ -34,16 +34,16 @@
/obj/structure/bookcase/attackby(obj/O as obj, mob/user as mob)
if(istype(O, /obj/item/weapon/book))
user.drop_item(src)
user.drop_item(O, src)
update_icon()
else if(istype(O, /obj/item/weapon/tome))
user.drop_item(src)
user.drop_item(O, src)
update_icon()
else if(istype(O, /obj/item/weapon/spellbook))
user.drop_item(src)
user.drop_item(O, src)
update_icon()
else if(istype(O, /obj/item/weapon/storage/bible))
user.drop_item(src)
user.drop_item(O, src)
update_icon()
else if(istype(O, /obj/item/weapon/wrench))
user << "<span class='notice'> Now disassembling bookcase</span>"
@@ -213,7 +213,7 @@
if(carved)
if(!store)
if(W.w_class < 3)
user.drop_item(src)
user.drop_item(W, src)
store = W
user << "<span class='notice'>You put [W] in [title].</span>"
return

4
code/modules/library/lib_machines.dm
View File

@@ -136,7 +136,7 @@ var/global/list/library_section_names = list("Any", "Fiction", "Non-Fiction", "A
/obj/machinery/libraryscanner/attackby(var/obj/O as obj, var/mob/user as mob)
if(istype(O, /obj/item/weapon/book))
user.drop_item(src)
user.drop_item(O, src)
else
return ..()
@@ -191,7 +191,7 @@ var/global/list/library_section_names = list("Any", "Fiction", "Non-Fiction", "A
/obj/machinery/bookbinder/attackby(var/obj/O as obj, var/mob/user as mob)
if(istype(O, /obj/item/weapon/paper) || istype(O, /obj/item/weapon/paper/nano))
user.drop_item(src)
user.drop_item(O, src)
user.visible_message("[user] loads some paper into [src].", "You load some paper into [src].")
src.visible_message("[src] begins to hum as it warms up its printing drums.")
sleep(rand(200,400))