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

Fixes some material datum bugs (#47049)

Browse Source 
* fixes

* chair

* ass

* fixes

* dumb

* done

* fix
This commit is contained in:
Qustinnus
2019-10-14 06:36:56 +02:00
committed by Emmett Gaines
parent e870857b8d
commit 908ccfe7b3
12 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/table_frames.dm
+3 -3
View File
@@ -45,14 +45,14 @@
return
to_chat(user, "<span class='notice'>You start adding [material] to [src]...</span>")
if(do_after(user, 20, target = src) && material.use(1))
var/list/material_list
var/list/material_list = list()
if(material.material_type)
material_list = list(material.material_type = MINERAL_MATERIAL_AMOUNT)
material_list[material.material_type] = MINERAL_MATERIAL_AMOUNT
make_new_table(/obj/structure/table/greyscale, material_list)
else
return ..()
/obj/structure/table_frame/proc/make_new_table(table_type, list/custom_materials) //makes sure the new table made retains what we had as a frame
/obj/structure/table_frame/proc/make_new_table(table_type, custom_materials) //makes sure the new table made retains what we had as a frame
var/obj/structure/table/T = new table_type(loc)
T.frame = type
T.framestack = framestack