Merge pull request #4604 from MistakeNot4892/feature/lounge

Adding a lounge.
NebulaSS13 · Dec 6, 2024 · 47e8d2b · 47e8d2b
2 parents 85b9c56 + 71a5a78
commit 47e8d2b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/code/game/objects/structures/stool_bed_chair_nest_sofa/pew.dm b/code/game/objects/structures/stool_bed_chair_nest_sofa/pew.dm
@@ -132,4 +132,20 @@
 
 /obj/structure/bed/chair/bench/pew/ebony
 	color    = /decl/material/solid/organic/wood/ebony::color
-	material = /decl/material/solid/organic/wood/ebony
+	material = /decl/material/solid/organic/wood/ebony
+
+/obj/structure/bed/chair/bench/lounge
+	name       = "lounge"
+	desc       = "An elegant lounge, perfect for reclining on."
+	icon       = 'icons/obj/structures/lounge.dmi'
+	icon_state = "lounge_standing"
+	base_icon  = "lounge"
+
+/obj/structure/bed/chair/bench/lounge/get_material_icon()
+	return icon
+
+/obj/structure/bed/chair/bench/lounge/mapped
+	color          = /decl/material/solid/organic/wood/mahogany::color
+	material       = /decl/material/solid/organic/wood/mahogany
+	reinf_material = /decl/material/solid/organic/cloth
+	padding_color  = COLOR_RED_GRAY
diff --git a/code/modules/crafting/stack_recipes/recipes_hardness_integrity.dm b/code/modules/crafting/stack_recipes/recipes_hardness_integrity.dm
@@ -52,6 +52,10 @@
 /decl/stack_recipe/hardness/integrity/furniture/bench/pew/single
 	result_type        = /obj/structure/bed/chair/bench/pew/single
 
+/decl/stack_recipe/hardness/integrity/furniture/bench/lounge
+	result_type        = /obj/structure/bed/chair/bench/lounge
+	difficulty         = MAT_VALUE_VERY_HARD_DIY
+
 /decl/stack_recipe/hardness/integrity/furniture/closet
 	result_type        = /obj/structure/closet
 

diff --git a/icons/obj/structures/benches.dmi b/icons/obj/structures/benches.dmi
diff --git a/icons/obj/structures/lounge.dmi b/icons/obj/structures/lounge.dmi