cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 22:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

added deconstructing

Browse Source
This commit is contained in:
paprka
2014-11-06 18:01:19 -08:00
parent 28b1d8bef0
commit d76e4f62e5
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/table_frames.dm
+2 -2
View File
@@ -22,7 +22,7 @@
if(istype(I, /obj/item/weapon/wrench))
user << "<span class='notice'>Now disassembling [src].</span>"
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 40))
if(do_after(user, 30))
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
new /obj/item/stack/rods(src.loc)
qdel(src)
@@ -65,7 +65,7 @@
if(istype(I, /obj/item/weapon/wrench))
user << "<span class='notice'>Now disassembling [src].</span>"
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 40))
if(do_after(user, 30))
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
new /obj/item/stack/sheet/mineral/wood(src.loc)
qdel(src)
code/game/objects/structures/tables_racks.dm
+25 -4
View File
@@ -282,6 +282,16 @@
table_destroy(2, user)
return
if (istype(I, /obj/item/weapon/wrench))
if(istype(src, /obj/structure/table/reinforced))
var/obj/structure/table/reinforced/RT = src
if(RT.status == 1)
table_destroy(3, user)
return
else
table_destroy(3, user)
return
if (istype(I, /obj/item/weapon/storage/bag/tray))
var/obj/item/weapon/storage/bag/tray/T = I
if(T.contents.len > 0) // If the tray isn't empty
@@ -318,7 +328,8 @@
*/
#define TBL_DESTROY 1
#define TBL_DECONSTRUCT 2
#define TBL_DISASSEMBLE 2
#define TBL_DECONSTRUCT 3
/obj/structure/table/proc/table_destroy(var/destroy_type, var/mob/user)
@@ -328,14 +339,24 @@
qdel(src)
return
if(destroy_type == TBL_DECONSTRUCT)
if(destroy_type == TBL_DISASSEMBLE)
user << "<span class='notice'>Now disassembling [src].</span>"
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 30))
if(do_after(user, 20))
new frame(src.loc)
new buildstack(src.loc)
qdel(src)
return
return
if(destroy_type == TBL_DECONSTRUCT)
user << "<span class='notice'>Now deconstructing [src].</span>"
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 40))
new framestack(src.loc)
new buildstack(src.loc)
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
qdel(src)
return
/*
* TABLE CLIMBING