From 33c3f0834ea7bf5fd8f5dc2248a8c02c6f5a9dc4 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Sat, 21 Sep 2019 20:01:42 +0200
Subject: [PATCH 1/2] Prevents sofas being wielded and thus transformed into
 normal chairs.

---
 .../game/objects/structures/beds_chairs/chair.dm | 16 ++++++++++++++++
 .../game/objects/structures/beds_chairs/sofa.dm  | 12 ------------
 2 files changed, 16 insertions(+), 12 deletions(-)
 delete mode 100644 modular_citadel/code/game/objects/structures/beds_chairs/sofa.dm

diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index 88d141a9ad..dde9bce1bc 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -489,3 +489,19 @@
 	. = ..()
 	if(has_gravity())
 		playsound(src, 'sound/machines/clockcult/integration_cog_install.ogg', 50, TRUE)
+
+/obj/structure/chair/sofa
+	name = "old ratty sofa"
+	icon_state = "sofamiddle"
+	icon = 'icons/obj/sofa.dmi'
+	buildstackamount = 1
+	item_chair = null
+
+/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/modular_citadel/code/game/objects/structures/beds_chairs/sofa.dm b/modular_citadel/code/game/objects/structures/beds_chairs/sofa.dm
deleted file mode 100644
index 69d0f4b8d8..0000000000
--- a/modular_citadel/code/game/objects/structures/beds_chairs/sofa.dm
+++ /dev/null
@@ -1,12 +0,0 @@
-/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

From b27bdfdcbeb479fa05d902e0bc7c012cccc0b1a3 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Sat, 21 Sep 2019 20:02:53 +0200
Subject: [PATCH 2/2] the .dme

---
 tgstation.dme | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tgstation.dme b/tgstation.dme
index f1430cebf2..4ad3fcfca4 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2956,7 +2956,6 @@
 #include "modular_citadel\code\game\objects\items\storage\firstaid.dm"
 #include "modular_citadel\code\game\objects\structures\tables_racks.dm"
 #include "modular_citadel\code\game\objects\structures\beds_chairs\chair.dm"
-#include "modular_citadel\code\game\objects\structures\beds_chairs\sofa.dm"
 #include "modular_citadel\code\game\objects\structures\crates_lockers\closets\fitness.dm"
 #include "modular_citadel\code\game\objects\structures\crates_lockers\closets\wardrobe.dm"
 #include "modular_citadel\code\game\objects\structures\crates_lockers\closets\secure\citadel_lockers.dm"