From 45b5bc20fbc0bdeb04e169f7aaa7ea8e14b4990b Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sun, 2 Dec 2018 10:01:27 -0800
Subject: [PATCH] Adds sofas

---
 .../objects/items/stacks/sheets/sheet_types.dm   |   6 ++++++
 code/game/objects/structures/beds_chairs/sofa.dm |  14 ++++++++++++++
 icons/obj/sofa.dmi                               | Bin 0 -> 2488 bytes
 tgstation.dme                                    |   1 +
 4 files changed, 21 insertions(+)
 create mode 100644 code/game/objects/structures/beds_chairs/sofa.dm
 create mode 100644 icons/obj/sofa.dmi

diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index fbfa3f50fe0..9a1db8a599e 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -32,6 +32,12 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
 		new/datum/stack_recipe("lime comfy chair", /obj/structure/chair/comfy/lime, 2, one_per_turf = TRUE, on_floor = TRUE), \
 		new/datum/stack_recipe("teal comfy chair", /obj/structure/chair/comfy/teal, 2, one_per_turf = TRUE, on_floor = TRUE), \
 		)), \
+	new/datum/stack_recipe_list("sofas", list(
+		new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa, 1, one_per_turf = TRUE, on_floor = TRUE),
+		new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/left, 1, one_per_turf = TRUE, on_floor = TRUE),
+		new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/right, 1, one_per_turf = TRUE, on_floor = TRUE),
+		new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corner, 1, one_per_turf = TRUE, on_floor = TRUE)
+		)),
 	null, \
 	new/datum/stack_recipe("rack parts", /obj/item/rack_parts), \
 	new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
diff --git a/code/game/objects/structures/beds_chairs/sofa.dm b/code/game/objects/structures/beds_chairs/sofa.dm
new file mode 100644
index 00000000000..473374f86ff
--- /dev/null
+++ b/code/game/objects/structures/beds_chairs/sofa.dm
@@ -0,0 +1,14 @@
+/obj/structure/chair/sofa
+	name = "old ratty sofa"
+	icon_state = "sofamiddle"
+	icon = 'icons/obj/sofa.dmi'
+	buildstackamount = 1
+
+/obj/structure/chair/sofa/left
+	icon_state = "sofaend_left"
+
+/obj/structure/chair/sofa/right
+	icon_state = "sofaend_right"
+
+/obj/structure/chair/sofa/corner
+	icon_state = "sofacorner"
\ No newline at end of file
diff --git a/icons/obj/sofa.dmi b/icons/obj/sofa.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..9e250506e1bc2395bd37d13e1e1bbbed2eb7c321
GIT binary patch
literal 2488
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
C%x8Z9

literal 0
HcmV?d00001

diff --git a/tgstation.dme b/tgstation.dme
index 22e5baa45b7..1a9a85be7ea 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1005,6 +1005,7 @@
 #include "code\game\objects\structures\beds_chairs\alien_nest.dm"
 #include "code\game\objects\structures\beds_chairs\bed.dm"
 #include "code\game\objects\structures\beds_chairs\chair.dm"
+#include "code\game\objects\structures\beds_chairs\sofa.dm"
 #include "code\game\objects\structures\crates_lockers\closets.dm"
 #include "code\game\objects\structures\crates_lockers\crates.dm"
 #include "code\game\objects\structures\crates_lockers\closets\bodybag.dm"