From 92991726ecb15123bf932944de4ad323d6d52810 Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Mon, 19 Nov 2018 09:52:25 +0100
Subject: [PATCH] Moved silencers, gave them their own folder

---
 code/modules/projectiles/gun_attachments.dm | 19 +++++++++++++++++++
 code/modules/projectiles/guns/projectile.dm | 18 +-----------------
 paradise.dme                                |  1 +
 3 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 code/modules/projectiles/gun_attachments.dm

diff --git a/code/modules/projectiles/gun_attachments.dm b/code/modules/projectiles/gun_attachments.dm
new file mode 100644
index 00000000000..9a5156b4546
--- /dev/null
+++ b/code/modules/projectiles/gun_attachments.dm
@@ -0,0 +1,19 @@
+//Put all your tacticool gun gadgets here. So far it's pretty empty
+
+
+/obj/item/suppressor
+	name = "suppressor"
+	desc = "A universal syndicate small-arms suppressor for maximum espionage."
+	icon = 'icons/obj/guns/projectile.dmi'
+	icon_state = "suppressor"
+	item_state = "suppressor"
+	w_class = WEIGHT_CLASS_SMALL
+	var/oldsound = null
+	var/initial_w_class = null
+	origin_tech = "combat=2;engineering=2"
+
+/obj/item/suppressor/specialoffer
+	name = "cheap suppressor"
+	desc = "A foreign knock-off suppressor, it feels flimsy, cheap, and brittle. Still fits all weapons."
+	icon = 'icons/obj/guns/projectile.dmi'
+	icon_state = "suppressor"
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 0ff5e57e7c5..39654c96a2b 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -183,20 +183,4 @@
 	for(var/obj/item/ammo_casing/AC in magazine.stored_ammo)
 		if(AC.BB)
 			process_fire(user, user,0)
-			. = 1
-
-/obj/item/suppressor
-	name = "suppressor"
-	desc = "A universal syndicate small-arms suppressor for maximum espionage."
-	icon = 'icons/obj/guns/projectile.dmi'
-	icon_state = "suppressor"
-	item_state = "suppressor"
-	w_class = WEIGHT_CLASS_SMALL
-	var/oldsound = null
-	var/initial_w_class = null
-
-/obj/item/suppressor/specialoffer
-	name = "cheap suppressor"
-	desc = "A foreign knock-off suppressor, it feels flimsy, cheap, and brittle. Still fits all weapons."
-	icon = 'icons/obj/guns/projectile.dmi'
-	icon_state = "suppressor"
+			. = 1
\ No newline at end of file
diff --git a/paradise.dme b/paradise.dme
index 276626669c5..5e2ba112406 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -2091,6 +2091,7 @@
 #include "code\modules\projectiles\ammunition.dm"
 #include "code\modules\projectiles\firing.dm"
 #include "code\modules\projectiles\gun.dm"
+#include "code\modules\projectiles\gun_attachments.dm"
 #include "code\modules\projectiles\projectile.dm"
 #include "code\modules\projectiles\ammunition\ammo_casings.dm"
 #include "code\modules\projectiles\ammunition\boxes.dm"