[MIRROR] Poker table dismantling now respects carpet subtypes (#1654)

* Poker table dismantling now respects carpet subtypes (#54869)

* Poker table dismantling now respects carpet subtypes

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-11-09 20:18:07 +00:00
committed by GitHub
co-authored by Ghom
parent 0227a2292d
commit 37fedce4ff
2 changed files with 8 additions and 3 deletions
+3 -3
View File
@@ -64,8 +64,8 @@
return ..()
/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)
/obj/structure/table_frame/proc/make_new_table(table_type, custom_materials, _buildstack) //makes sure the new table made retains what we had as a frame
var/obj/structure/table/T = new table_type(loc, _buildstack)
T.frame = type
T.framestack = framestack
T.framestackamount = framestackamount
@@ -108,6 +108,6 @@
return
to_chat(user, "<span class='notice'>You start adding [material] to [src]...</span>")
if(do_after(user, 20, target = src) && material.use(1))
make_new_table(toConstruct)
make_new_table(toConstruct, null, type)
else
return ..()
@@ -37,6 +37,11 @@
smoothing_groups = list(SMOOTH_GROUP_TABLES)
canSmoothWith = list(SMOOTH_GROUP_TABLES)
/obj/structure/table/Initialize(mapload, _buildstack)
. = ..()
if(_buildstack)
buildstack = _buildstack
/obj/structure/table/examine(mob/user)
. = ..()
. += deconstruction_hints(user)