From 20e957755f618194198d1b26c17c3446e51e3b17 Mon Sep 17 00:00:00 2001
From: PestoVerde322 <75247747+PestoVerde322@users.noreply.github.com>
Date: Fri, 2 Sep 2022 18:02:09 +0100
Subject: [PATCH 1/2] Fix for Corporate Benches and Chair deconstruction + Time
to build for chairs (#7594)
* Buncha chair fixes
* Forgot the test benches there, whoops
* fixess!
* removed a decal off fland, whoops
---
code/datums/greyscale/greyscale_configs.dm | 72 ++++++++++++++
code/datums/mutable_appearance.dm | 4 +-
.../items/stacks/sheets/sheet_types.dm | 93 ++++++++++++++++++
.../objects/structures/beds_chairs/bench.dm | 90 +++++++++++++++++
.../objects/structures/beds_chairs/chair.dm | 8 ++
icons/obj/beds_chairs/benches.dmi | Bin 0 -> 16147 bytes
6 files changed, 266 insertions(+), 1 deletion(-)
create mode 100644 code/game/objects/structures/beds_chairs/bench.dm
create mode 100644 icons/obj/beds_chairs/benches.dmi
diff --git a/code/datums/greyscale/greyscale_configs.dm b/code/datums/greyscale/greyscale_configs.dm
index 229b3648430..4d352c14e17 100644
--- a/code/datums/greyscale/greyscale_configs.dm
+++ b/code/datums/greyscale/greyscale_configs.dm
@@ -117,3 +117,75 @@
name = "Sneakers marisa"
icon_file = 'icons/obj/clothing/shoes.dmi'
json_config = 'code/datums/greyscale/json_configs/sneakers_marisa.json'
+<<<<<<< HEAD
+=======
+
+/datum/greyscale_config/plasmaman_helmet_default
+ name = "Default plasmaman helmet"
+ icon_file = 'icons/obj/clothing/hats.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_default.json'
+
+/datum/greyscale_config/plasmaman_helmet_default_worn
+ name = "Default plasmaman helmet"
+ icon_file = 'icons/mob/clothing/head.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_default_worn.json'
+
+/datum/greyscale_config/plasmaman_helmet_mark2
+ name = "Mark II plasmaman helmet"
+ icon_file = 'icons/obj/clothing/hats.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_mk2.json'
+
+/datum/greyscale_config/plasmaman_helmet_mark2_worn
+ name = "Mark II plasmaman helmet"
+ icon_file = 'icons/mob/clothing/head.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_mk2_worn.json'
+
+/datum/greyscale_config/plasmaman_helmet_protective
+ name = "Protective plasmaman helmet"
+ icon_file = 'icons/obj/clothing/hats.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_protective.json'
+
+/datum/greyscale_config/plasmaman_helmet_protective_worn
+ name = "Protective plasmaman helmet"
+ icon_file = 'icons/mob/clothing/head.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_protective_worn.json'
+
+/datum/greyscale_config/plasmaman_helmet_default_inhand_left
+ name = "Held Default plasmam helmet, left"
+ icon_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_default_inhand.json'
+
+/datum/greyscale_config/plasmaman_helmet_default_inhand_right
+ name = "Held Default plasmam helmet, right"
+ icon_file = 'icons/mob/inhands/clothing_righthand.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_default_inhand.json'
+
+/datum/greyscale_config/plasmaman_helmet_protective_inhand_left
+ name = "Held Protective plasmam helmet, left"
+ icon_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_protective_inhand.json'
+
+/datum/greyscale_config/plasmaman_helmet_protective_inhand_right
+ name = "Held Protective plasmam helmet, right"
+ icon_file = 'icons/mob/inhands/clothing_righthand.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_protective_inhand.json'
+
+/datum/greyscale_config/plasmaman_helmet_mark2_inhand_left
+ name = "Held Mark II plasmam helmet, left"
+ icon_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_mk2_inhand.json'
+
+/datum/greyscale_config/plasmaman_helmet_mark2_inhand_right
+ name = "Held Mark II plasmam helmet, right"
+ icon_file = 'icons/mob/inhands/clothing_righthand.dmi'
+ json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_mk2_inhand.json'
+
+/datum/greyscale_config/carp
+ name = "Space Carp"
+ icon_file = 'icons/mob/carp.dmi'
+ json_config = 'code/datums/greyscale/json_configs/carp.json'
+
+/datum/greyscale_config/carp/disk_mouth
+ name = "Space Carp Disk in Mouth"
+ json_config = 'code/datums/greyscale/json_configs/carp_disk_mouth.json'
+>>>>>>> 94c6a7a7ee... Fix for Corporate Benches and Chair deconstruction + Time to build for chairs (#7594)
diff --git a/code/datums/mutable_appearance.dm b/code/datums/mutable_appearance.dm
index 1b095c555d5..8758a8f5700 100644
--- a/code/datums/mutable_appearance.dm
+++ b/code/datums/mutable_appearance.dm
@@ -10,10 +10,12 @@
// And yes this does have to be in the constructor, BYOND ignores it if you set it as a normal var
// Helper similar to image()
-/proc/mutable_appearance(icon, icon_state = "", layer = FLOAT_LAYER, plane = FLOAT_PLANE)
+/proc/mutable_appearance(icon, icon_state = "", layer = FLOAT_LAYER, plane = FLOAT_PLANE, color)
var/mutable_appearance/MA = new()
MA.icon = icon
MA.icon_state = icon_state
MA.layer = layer
MA.plane = plane
+ if(color)
+ MA.color = color
return MA
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index a28ef5e629c..773b9babb83 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -17,6 +17,7 @@
* Metal
*/
GLOBAL_LIST_INIT(metal_recipes, list ( \
+<<<<<<< HEAD
new/datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("bar stool", /obj/structure/chair/stool/bar, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("chair", /obj/structure/chair, one_per_turf = TRUE, on_floor = TRUE), \
@@ -45,6 +46,49 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/corp/left, one_per_turf = TRUE, on_floor = TRUE), \
new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/corp/right, one_per_turf = TRUE, on_floor = TRUE), \
new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corp/corner, one_per_turf = TRUE, on_floor = TRUE), \
+=======
+ new/datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = TRUE, on_floor = TRUE, time = 15), \
+ new/datum/stack_recipe("bar stool", /obj/structure/chair/stool/bar, one_per_turf = TRUE, on_floor = TRUE, time = 15), \
+ new/datum/stack_recipe("chair", /obj/structure/chair, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+
+ null, \
+ new/datum/stack_recipe_list("office chairs", list( \
+ new/datum/stack_recipe("dark office chair", /obj/structure/chair/office, 5, one_per_turf = TRUE, on_floor = TRUE, time = 15), \
+ new/datum/stack_recipe("light office chair", /obj/structure/chair/office/light, 5, one_per_turf = TRUE, on_floor = TRUE, time = 15), \
+ )), \
+ new/datum/stack_recipe_list("beds", list( \
+ new/datum/stack_recipe("single bed", /obj/structure/bed, 2, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ new/datum/stack_recipe("double bed", /obj/structure/bed/double, 2, one_per_turf = TRUE, on_floor = TRUE, time = 40), \
+ )), \
+ new/datum/stack_recipe_list("comfy chairs", list( \
+ new/datum/stack_recipe("comfy chair", /obj/structure/chair/fancy/comfy, 2, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ new/datum/stack_recipe("corporate chair", /obj/structure/chair/fancy/corp, 2, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ new/datum/stack_recipe("shuttle seat", /obj/structure/chair/fancy/shuttle, 2, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ )), \
+ new/datum/stack_recipe_list("old sofa", list(
+ new /datum/stack_recipe("old sofa (middle)", /obj/structure/chair/fancy/sofa/old, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ new /datum/stack_recipe("old sofa (left)", /obj/structure/chair/fancy/sofa/old/left, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ new /datum/stack_recipe("old sofa (right)", /obj/structure/chair/fancy/sofa/old/right, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ new /datum/stack_recipe("old sofa (concave corner)", /obj/structure/chair/fancy/sofa/old/corner/concave, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ new /datum/stack_recipe("old sofa (convex corner)", /obj/structure/chair/fancy/sofa/old/corner/convex, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ )), \
+ new /datum/stack_recipe_list("corporate sofas", list( \
+ new /datum/stack_recipe("corporate sofa (middle)", /obj/structure/chair/fancy/sofa/corp, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ new /datum/stack_recipe("corporate sofa (left)", /obj/structure/chair/fancy/sofa/corp/left, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ new /datum/stack_recipe("corporate sofa (right)", /obj/structure/chair/fancy/sofa/corp/right, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ new /datum/stack_recipe("corporate sofa (concave corner)", /obj/structure/chair/fancy/sofa/corp/corner/concave, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ new /datum/stack_recipe("corporate sofa (convex corner)", /obj/structure/chair/fancy/sofa/corp/corner/convex, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ )), \
+ new /datum/stack_recipe_list("benches", list( \
+ new /datum/stack_recipe("bench (middle)", /obj/structure/chair/fancy/bench, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ new /datum/stack_recipe("bench (left)", /obj/structure/chair/fancy/bench/left, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ new /datum/stack_recipe("bench (right)", /obj/structure/chair/fancy/bench/right, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ )), \
+ new /datum/stack_recipe_list("corporate benches", list( \
+ new /datum/stack_recipe("corporate bench (middle)", /obj/structure/chair/fancy/bench/corporate, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ new /datum/stack_recipe("corporate bench (left)", /obj/structure/chair/fancy/bench/corporate/left, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ new /datum/stack_recipe("corporate bench (right)", /obj/structure/chair/fancy/bench/corporate/right, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+>>>>>>> 94c6a7a7ee... Fix for Corporate Benches and Chair deconstruction + Time to build for chairs (#7594)
)),
null, \
new/datum/stack_recipe("rack parts", /obj/item/rack_parts), \
@@ -196,6 +240,7 @@ GLOBAL_LIST_INIT(plasteel_recipes, list ( \
* Wood
*/
GLOBAL_LIST_INIT(wood_recipes, list ( \
+<<<<<<< HEAD
new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), \
new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \
new/datum/stack_recipe("wood table frame", /obj/structure/table_frame/wood, 2, time = 10), \
@@ -229,6 +274,41 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new /datum/stack_recipe("pew (middle)", /obj/structure/chair/pew, 3, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("pew (left)", /obj/structure/chair/pew/left, 3, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("pew (right)", /obj/structure/chair/pew/right, 3, one_per_turf = TRUE, on_floor = TRUE)
+=======
+ new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), \
+ new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \
+ new/datum/stack_recipe("wood table frame", /obj/structure/table_frame/wood, 2, time = 10), \
+ new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), \
+ new/datum/stack_recipe("rolling pin", /obj/item/kitchen/rollingpin, 2, time = 30), \
+ new/datum/stack_recipe("wooden chair", /obj/structure/chair/wood/, 3, time = 20, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("winged wooden chair", /obj/structure/chair/wood/wings, 3, time = 30, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("coffin", /obj/structure/closet/crate/coffin, 5, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("book case", /obj/structure/bookcase, 4, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying_rack, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("dog bed", /obj/structure/bed/dogbed, 10, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("dresser", /obj/structure/dresser, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("picture frame", /obj/item/wallframe/picture, 1, time = 10),\
+ new/datum/stack_recipe("painting frame", /obj/item/wallframe/painting, 1, time = 10),\
+ new/datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("easel", /obj/structure/easel, 5, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \
+ new/datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),\
+ new/datum/stack_recipe("tiki mask", /obj/item/clothing/mask/gas/tiki_mask, 2), \
+ new/datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),\
+ new/datum/stack_recipe("ore box", /obj/structure/ore_box, 4, time = 50, one_per_turf = TRUE, on_floor = TRUE),\
+ new/datum/stack_recipe("wooden crate", /obj/structure/closet/crate/wooden, 6, time = 50, one_per_turf = TRUE, on_floor = TRUE),\
+ new/datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15),\
+ new/datum/stack_recipe("loom", /obj/structure/loom, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("mortar", /obj/item/reagent_containers/glass/mortar, 3), \
+ new/datum/stack_recipe("firebrand", /obj/item/match/firebrand, 2, time = 100), \
+ null, \
+ new/datum/stack_recipe_list("pews", list(
+ new /datum/stack_recipe("pew (middle)", /obj/structure/chair/fancy/bench/pew, 3, one_per_turf = TRUE, on_floor = TRUE, time = 20),
+ new /datum/stack_recipe("pew (left)", /obj/structure/chair/fancy/bench/pew/left, 3, one_per_turf = TRUE, on_floor = TRUE, time = 20),
+ new /datum/stack_recipe("pew (right)", /obj/structure/chair/fancy/bench/pew/right, 3, one_per_turf = TRUE, on_floor = TRUE, time = 20)
+>>>>>>> 94c6a7a7ee... Fix for Corporate Benches and Chair deconstruction + Time to build for chairs (#7594)
)),
null, \
))
@@ -651,7 +731,11 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
new/datum/stack_recipe("bronze suit", /obj/item/clothing/suit/bronze), \
new/datum/stack_recipe("bronze boots", /obj/item/clothing/shoes/bronze), \
null,
+<<<<<<< HEAD
new/datum/stack_recipe("bronze chair", /obj/structure/chair/bronze, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
+=======
+ new/datum/stack_recipe("bronze chair", /obj/structure/chair/fancy/brass/bronze, 1, time = 40, one_per_turf = TRUE, on_floor = TRUE), \
+>>>>>>> 94c6a7a7ee... Fix for Corporate Benches and Chair deconstruction + Time to build for chairs (#7594)
))
/obj/item/stack/tile/bronze
@@ -726,10 +810,19 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
merge_type = /obj/item/stack/sheet/bone
GLOBAL_LIST_INIT(plastic_recipes, list(
+<<<<<<< HEAD
new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \
new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/waterbottle/empty), \
new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/waterbottle/large/empty,3), \
new /datum/stack_recipe("wet floor sign", /obj/item/clothing/suit/caution, 2)))
+=======
+ new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \
+ new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/waterbottle/empty), \
+ new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/waterbottle/large/empty,3), \
+ new /datum/stack_recipe("wet floor sign", /obj/item/clothing/suit/caution, 2), \
+ new /datum/stack_recipe("plastic chair", /obj/structure/chair/fancy/plastic, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
+ ))
+>>>>>>> 94c6a7a7ee... Fix for Corporate Benches and Chair deconstruction + Time to build for chairs (#7594)
/obj/item/stack/sheet/plastic
name = "plastic"
diff --git a/code/game/objects/structures/beds_chairs/bench.dm b/code/game/objects/structures/beds_chairs/bench.dm
new file mode 100644
index 00000000000..040603ed458
--- /dev/null
+++ b/code/game/objects/structures/beds_chairs/bench.dm
@@ -0,0 +1,90 @@
+/obj/structure/chair/fancy/bench
+ name = "bench"
+ desc = "You sit in this. Either by will or force, but maybe not alone."
+ icon = 'icons/obj/beds_chairs/benches.dmi'
+ max_integrity = 250
+ integrity_failure = 25
+ icon_state = "bench_center"
+
+/obj/structure/chair/fancy/bench/left
+ icon_state = "bench_left"
+
+/obj/structure/chair/fancy/bench/right
+ icon_state = "bench_right"
+
+/obj/structure/chair/fancy/bench/pew
+ name = "wooden pew"
+ desc = "Kneel here and pray."
+ icon_state = "pewmiddle"
+ resistance_flags = FLAMMABLE
+ max_integrity = 70
+ buildstacktype = /obj/item/stack/sheet/mineral/wood
+ buildstackamount = 3
+ item_chair = null
+
+/obj/structure/chair/fancy/bench/pew/left
+ name = "left wooden pew end"
+ icon_state = "pewend_left"
+
+/obj/structure/chair/fancy/bench/pew/right
+ name = "right wooden pew end"
+ icon_state = "pewend_right"
+
+// Bamboo benches
+/obj/structure/chair/fancy/bench/bamboo
+ name = "bamboo bench"
+ desc = "A makeshift bench with a rustic aesthetic."
+ icon_state = "bamboo_sofamiddle"
+ resistance_flags = FLAMMABLE
+ max_integrity = 60
+ buildstacktype = /obj/item/stack/sheet/mineral/bamboo
+ buildstackamount = 3
+
+/obj/structure/chair/fancy/bench/bamboo/left
+ icon_state = "bamboo_sofaend_left"
+
+/obj/structure/chair/fancy/bench/bamboo/right
+ icon_state = "bamboo_sofaend_right"
+
+// Ported from tg ported from Skyrat, oh and this version is off Paradise, aka GAGless but almost GAGs!
+/obj/structure/chair/fancy/bench/corporate
+ name = "corporate bench"
+ desc = "Perfectly designed to be comfortable to sit on, and hellish to sleep on."
+ icon_state = "corporate_bench_middle_mapping"
+ var/base_icon_state = "corporate_bench_middle"
+ ///icon for the cover seat
+ var/image/cover
+ ///cover seat color, by default this one
+ var/cover_color = rgb(175, 125, 40)
+ color = null
+ colorable = FALSE
+
+/obj/structure/chair/fancy/bench/corporate/Initialize(mapload)
+ icon_state = base_icon_state //so the rainbow seats for mapper clarity are not in-game
+ GetCover()
+ return ..()
+
+/obj/structure/chair/fancy/bench/corporate/proc/GetCover()
+ if(cover)
+ cut_overlay(cover)
+ cover = mutable_appearance('icons/obj/beds_chairs/benches.dmi', "[icon_state]_cover", color = cover_color) //this supports colouring, but not the base bench
+ add_overlay(cover)
+
+/obj/structure/chair/fancy/bench/corporate/attacked_by(obj/item/I, mob/living/user)
+ . = ..()
+ if(istype(I, /obj/item/toy/crayon))
+ var/obj/item/toy/crayon/C = I
+ cover_color = C.crayon_color
+ if(cover_color)
+ GetCover()
+
+/obj/structure/chair/fancy/bench/corporate/handle_layer()
+ return
+
+/obj/structure/chair/fancy/bench/corporate/left
+ icon_state = "corporate_bench_left_mapping"
+ base_icon_state = "corporate_bench_left"
+
+/obj/structure/chair/fancy/bench/corporate/right
+ icon_state = "corporate_bench_right_mapping"
+ base_icon_state = "corporate_bench_right"
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index 4fe54104733..adc898ac870 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -71,9 +71,17 @@
qdel(src)
/obj/structure/chair/attackby(obj/item/W, mob/user, params)
+<<<<<<< HEAD
if(W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1))
W.play_tool_sound(src)
deconstruct()
+=======
+ if(W.tool_behaviour == TOOL_WRENCH && !(flags_1 & NODECONSTRUCT_1))
+ to_chat(user, "You start deconstructing [src]...")
+ if(W.use_tool(src, user, 30, volume=50))
+ playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
+ deconstruct(TRUE, 1)
+>>>>>>> 94c6a7a7ee... Fix for Corporate Benches and Chair deconstruction + Time to build for chairs (#7594)
else if(istype(W, /obj/item/assembly/shock_kit))
if(!user.temporarilyRemoveItemFromInventory(W))
return
diff --git a/icons/obj/beds_chairs/benches.dmi b/icons/obj/beds_chairs/benches.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..9728e7ff318e2e99cca765ef781f1d3904b52604
GIT binary patch
literal 16147
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
Lx5w)6HsL5X!#6aiPJ6RV+{
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
Date: Fri, 2 Sep 2022 19:02:55 +0200
Subject: [PATCH 2/2] Fix for Corporate Benches and Chair deconstruction + Time
to build for chairs