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

Merge pull request #7069 from Firecage/table_deconstruction_fix

Browse Source 
Fixes amount of materials gotten from deconstructing tables
This commit is contained in:
phil235
2015-01-17 19:57:49 +01:00
parent c7e25dfdaa dc602f9d57
commit 8a61d11e2e
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/table_frames.dm
+7 -8
View File
@@ -17,6 +17,8 @@
density = 0
anchored = 0
layer = 2.8
var/framestack = /obj/item/stack/rods
var/framestackamount = 2
/obj/structure/table_frame/attackby(var/obj/item/I, mob/user)
if(istype(I, /obj/item/weapon/wrench))
@@ -24,7 +26,8 @@
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 30))
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
new /obj/item/stack/rods(src.loc)
for(var/i = 1, i <= framestackamount, i++)
new framestack(get_turf(src))
qdel(src)
return
if(istype(I, /obj/item/stack/sheet/plasteel))
@@ -60,16 +63,12 @@
name = "wooden table frame"
desc = "Four wooden legs with four framing wooden rods for a wooden table. You could easily pass through this."
icon_state = "wood_frame"
framestack = /obj/item/stack/sheet/mineral/wood
framestackamount = 2
/obj/structure/table_frame/wood/attackby(var/obj/item/I, mob/user)
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, 30))
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
new /obj/item/stack/sheet/mineral/wood(src.loc)
qdel(src)
return
..()
if(istype(I, /obj/item/stack/sheet/mineral/wood))
var/obj/item/stack/sheet/mineral/wood/W = I
user << "<span class='notice'>Now adding [W] to [src].</span>"
code/game/objects/structures/tables_racks.dm
+12 -5
View File
@@ -25,6 +25,8 @@
var/framestack = /obj/item/stack/rods
var/buildstack = /obj/item/stack/sheet/metal
var/busy = 0
var/buildstackamount = 1
var/framestackamount = 2
/obj/structure/table/New()
..()
@@ -333,8 +335,10 @@
/obj/structure/table/proc/table_destroy(var/destroy_type, var/mob/user)
if(destroy_type == TBL_DESTROY)
new framestack(src.loc)
new buildstack(src.loc)
for(var/i = 1, i <= framestackamount, i++)
new framestack(get_turf(src))
for(var/i = 1, i <= buildstackamount, i++)
new buildstack(get_turf(src))
qdel(src)
return
@@ -343,7 +347,8 @@
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20))
new frame(src.loc)
new buildstack(src.loc)
for(var/i = 1, i <= buildstackamount, i++)
new buildstack(get_turf(src))
qdel(src)
return
@@ -351,8 +356,10 @@
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)
for(var/i = 1, i <= framestackamount, i++)
new framestack(get_turf(src))
for(var/i = 1, i <= buildstackamount, i++)
new buildstack(get_turf(src))
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
qdel(src)
return