From 08f1fabb692318b7dc9470389ccf399b08c103a8 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 25 Jul 2022 23:13:41 -0400
Subject: [PATCH 01/28] woohoo

---
 mods/persistence/_persistence.dme | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme
index 6157abf3414..d7df2d3eed7 100644
--- a/mods/persistence/_persistence.dme
+++ b/mods/persistence/_persistence.dme
@@ -122,6 +122,8 @@
 #include "modules\fabrication\fabricator_build.dm"
 #include "modules\fabrication\fabricator_intake.dm"
 #include "modules\fabrication\designs\textile\space.dm"
+#include "modules\fabrication\designs\protolathe\designs_overrides.dm"
+#include "modules\fabrication\designs\protolathe\designs_weapons.dm"
 #include "modules\hydroponics\grown.dm"
 #include "modules\hydroponics\grown_indedible.dm"
 #include "modules\hydroponics\seed_machines.dm"

From cfe2d2c67eef19d1069c5b809008880650628928 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 25 Jul 2022 23:15:01 -0400
Subject: [PATCH 02/28] Update boltaction.dm

---
 .../projectiles/guns/projectile/tier0/boltaction.dm        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm
index a54db04459e..7b8789f95e5 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm
@@ -9,10 +9,15 @@
 	handle_casings = HOLD_CASINGS
 	load_method = SINGLE_CASING
 	max_shells = 1
+	w_class = ITEM_SIZE_HUGE
 	ammo_type = /obj/item/ammo_casing/rifle
 	one_hand_penalty = 20
 	fire_delay = 20
 	accuracy = -1
+	material = /decl/material/solid/wood
+	matter = list(
+		/decl/material/solid/metal/steel = MATTER_AMOUNT_REINFORCEMENT
+	)
 
 /obj/item/gun/projectile/bolt_action/handmade/empty
-	starts_loaded = FALSE
\ No newline at end of file
+	starts_loaded = FALSE

From 4032cdeb896e0cd3a4c6b892c28c333a9fc4588a Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 25 Jul 2022 23:15:25 -0400
Subject: [PATCH 03/28] Update revolver.dm

---
 .../modules/projectiles/guns/projectile/tier0/revolver.dm    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm
index 6095e40e669..d126c062ee5 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm
@@ -6,10 +6,15 @@
 	caliber = CALIBER_PISTOL
 	ammo_type = /obj/item/ammo_casing/pistol
 	max_shells = 3
+	w_class = ITEM_SIZE_NORMAL
 	fire_delay = 12
 	accuracy = -1
 	one_hand_penalty = 2
 	force = 5
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/wood = MATTER_AMOUNT_REINFORCEMENT
+	)
 
 /obj/item/gun/projectile/revolver/handmade/empty
 	starts_loaded = FALSE

From 30f0f9fad63ced8b6e9ffa194a6ee0276ca293db Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 25 Jul 2022 23:16:00 -0400
Subject: [PATCH 04/28] Update shotgun.dm

---
 .../modules/projectiles/guns/projectile/tier0/shotgun.dm      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm
index 1310d792a58..fa6af11180f 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm
@@ -14,6 +14,10 @@
 	screen_shake = 2
 	accuracy = -1
 	one_hand_penalty = 10
+	material = /decl/material/solid/wood
+	matter = list(
+		/decl/material/solid/metal/steel = MATTER_AMOUNT_REINFORCEMENT
+	)
 
 /obj/item/gun/projectile/shotgun/handmade/empty
 	starts_loaded = FALSE

From a88e0a65e9cabd301af8031e73e22f294ad2bffa Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 25 Jul 2022 23:16:30 -0400
Subject: [PATCH 05/28] Update boltaction.dm

---
 .../projectiles/guns/projectile/tier1/boltaction.dm       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm
index cbff7bedd63..73e1e102797 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm
@@ -9,10 +9,16 @@
 	handle_casings = HOLD_CASINGS
 	load_method = SINGLE_CASING
 	max_shells = 5
+	w_class = ITEM_SIZE_HUGE
 	ammo_type = /obj/item/ammo_casing/rifle
 	one_hand_penalty = 10
 	fire_delay = 12
 	accuracy = 0
+	material = /decl/material/solid/wood
+	matter = list(
+		/decl/material/solid/metal/steel = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE
+	)
 
 /obj/item/gun/projectile/bolt_action/simple/empty
-	starts_loaded = FALSE
\ No newline at end of file
+	starts_loaded = FALSE

From cc1f253a089a6faeeca88fe6a7209fd1d9caf8f4 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 25 Jul 2022 23:17:02 -0400
Subject: [PATCH 06/28] Update pistol.dm

---
 .../modules/projectiles/guns/projectile/tier1/pistol.dm   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm
index 6f0059ef1b8..e085e70d289 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm
@@ -8,6 +8,12 @@
 	one_hand_penalty = 0
 	origin_tech = "{'combat':3,'engineering':2,'materials':2}"
 	ammo_indicator = FALSE
+	w_class = ITEM_SIZE_NORMAL
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/wood = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE
+	)
 
 /obj/item/gun/projectile/pistol/simple/empty
-	starts_loaded = FALSE
\ No newline at end of file
+	starts_loaded = FALSE

From 7bb6abba6a86bb08ce5436104579d408ef4fe9f3 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 25 Jul 2022 23:17:27 -0400
Subject: [PATCH 07/28] Update pistol_gold.dm

---
 .../projectiles/guns/projectile/tier1/pistol_gold.dm   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm
index e7f7f8527cf..4859aa6afff 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm
@@ -2,7 +2,13 @@
 	name = "ZSS HG 'Midas'"
 	desc = "This particular 'Colt' handgun has been made using an alloy of gold and an unknown material. It's been handmade by an expert artisan who has been lost to time. This gun isn't so much a weapon as it is a piece of art. This one in particular is chambered in 10mm rounds and is functionally identical to a normal 'Colt' handgun."
 	icon = 'mods/persistence/icons/obj/guns/tier1/pistol_gold.dmi'
-	origin_tech = "{'combat':3,'engineering':2,'materials':10}" // very high material tech because it has rare components inside
+	origin_tech = "{'combat':3,'engineering':2,'materials':5}" // very high material tech because it has rare components inside
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/wood = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE,
+		/decl/material/solid/metal/gold = MATTER_AMOUNT_REINFORCEMENT
+	)
 
 /obj/item/gun/projectile/pistol/simple/golden/empty
-	starts_loaded = FALSE
\ No newline at end of file
+	starts_loaded = FALSE

From 5a125a49529d67a60fe12b3b906b61f9b4a6b038 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 25 Jul 2022 23:17:52 -0400
Subject: [PATCH 08/28] Update revolver.dm

---
 .../modules/projectiles/guns/projectile/tier1/revolver.dm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm
index 7d261d8c42f..6f4e95ed97c 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm
@@ -6,10 +6,16 @@
 	caliber = CALIBER_PISTOL
 	ammo_type = /obj/item/ammo_casing/pistol
 	max_shells = 5
+	w_class = ITEM_SIZE_NORMAL
 	fire_delay = 10
 	accuracy = 0
 	one_hand_penalty = 0
 	force = 5
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/wood = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE
+	)
 
 /obj/item/gun/projectile/revolver/simple/empty
-	starts_loaded = FALSE
\ No newline at end of file
+	starts_loaded = FALSE

From 066bc03229704943b6238827242e6437ecb21a0d Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 25 Jul 2022 23:18:13 -0400
Subject: [PATCH 09/28] Update shotgun_db.dm

---
 .../projectiles/guns/projectile/tier1/shotgun_db.dm        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm
index d486ad8cb3c..c5fbfc64293 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm
@@ -14,6 +14,11 @@
 	screen_shake = 1
 	accuracy = 0
 	one_hand_penalty = 10 // doesnt improve over handmade shotgun penalty because you really should not be one-handing a shotgun
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/wood = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE
+	)
 
 	burst_delay = 0
 	firemodes = list(
@@ -22,4 +27,4 @@
 		)
 
 /obj/item/gun/projectile/shotgun/simple/empty
-	starts_loaded = FALSE
\ No newline at end of file
+	starts_loaded = FALSE

From 0d9d239e5748370e54a7cebf97e56c8639bb535d Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 25 Jul 2022 23:18:42 -0400
Subject: [PATCH 10/28] Update shotgun_pump.dm

---
 .../projectiles/guns/projectile/tier1/shotgun_pump.dm        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm
index a71ae112ee1..39728aa3903 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm
@@ -13,6 +13,11 @@
 	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
 	handle_casings = HOLD_CASINGS
 	one_hand_penalty = 10
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/wood = MATTER_AMOUNT_TRACE,
+		/decl/material/solid/metal/plasteel = MATTER_AMOUNT_TRACE
+	)
 
 /obj/item/gun/projectile/shotgun/pump/simple/empty
 	starts_loaded = FALSE

From 50ed17aad1ec201d9cf34bc17c3ba9f03e07a6c0 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 25 Jul 2022 23:19:05 -0400
Subject: [PATCH 11/28] Update lasrifle.dm

---
 .../modules/projectiles/guns/energy/tier0/lasrifle.dm        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm b/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm
index 4283c223ffd..d8eff9318be 100644
--- a/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm
+++ b/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm
@@ -10,3 +10,8 @@
 	fire_delay = 15
 	origin_tech = "{'combat':2,'magnets':1,'engineering':1,'materials':2}"
 	projectile_type = /obj/item/projectile/beam/smalllaser
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/glass = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/metal/silver = MATTER_AMOUNT_TRACE
+	)

From 672da90b58481fab923fb77da09fb3bfb3d0f665 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 25 Jul 2022 23:19:31 -0400
Subject: [PATCH 12/28] Update lasrifle.dm

---
 .../modules/projectiles/guns/energy/tier1/lasrifle.dm  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mods/persistence/modules/projectiles/guns/energy/tier1/lasrifle.dm b/mods/persistence/modules/projectiles/guns/energy/tier1/lasrifle.dm
index 1a3c883d9c1..8f17ee2c69f 100644
--- a/mods/persistence/modules/projectiles/guns/energy/tier1/lasrifle.dm
+++ b/mods/persistence/modules/projectiles/guns/energy/tier1/lasrifle.dm
@@ -3,10 +3,16 @@
 	desc = "The Marine model is one of the more ubiquitous energy weapon designs. While its capacity leaves something to be desired, it is incredibly easy to mass-produce and has great beam strength for its low manufacturing cost. It is often seen in the hands of corporate space marines, hence the name."
 	icon = 'mods/persistence/icons/obj/guns/tier1/lasrifle.dmi'
 	slot_flags = SLOT_BACK
-	w_class = ITEM_SIZE_LARGE
+	w_class = ITEM_SIZE_HUGE
 	one_hand_penalty = 3
 	max_shots = 5
 	fire_delay = 12
 	force = 10
 	origin_tech = "{'combat':3,'magnets':2,'engineering':2,'materials':3}"
-	projectile_type = /obj/item/projectile/beam/midlaser
\ No newline at end of file
+	projectile_type = /obj/item/projectile/beam/midlaser
+	material = /decl/material/solid/metal/aluminium
+	matter = list(
+		/decl/material/solid/glass = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/metal/silver = MATTER_AMOUNT_TRACE,
+		/decl/material/solid/metal/steel = MATTER_AMOUNT_REINFORCEMENT
+	)

From 82226f436cf1422e0186ec39f76e9e84fc655eb1 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 25 Jul 2022 23:19:47 -0400
Subject: [PATCH 13/28] Update laspistol.dm

---
 .../modules/projectiles/guns/energy/tier1/laspistol.dm    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mods/persistence/modules/projectiles/guns/energy/tier1/laspistol.dm b/mods/persistence/modules/projectiles/guns/energy/tier1/laspistol.dm
index 3a095b14a59..f824c4962f6 100644
--- a/mods/persistence/modules/projectiles/guns/energy/tier1/laspistol.dm
+++ b/mods/persistence/modules/projectiles/guns/energy/tier1/laspistol.dm
@@ -9,4 +9,10 @@
 	fire_delay = 5
 	force = 3 // made of light-ish plastics rather than wood and metal
 	origin_tech = "{'combat':3,'magnets':2,'engineering':2,'materials':3}"
-	projectile_type = /obj/item/projectile/beam/smalllaser
\ No newline at end of file
+	projectile_type = /obj/item/projectile/beam/smalllaser
+	material = /decl/material/solid/metal/aluminium
+	matter = list(
+		/decl/material/solid/glass = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/metal/silver = MATTER_AMOUNT_TRACE,
+		/decl/material/solid/metal/steel = MATTER_AMOUNT_TRACE
+	)

From 08faf2a832fa2df25b68be0997475ef0069a2414 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 25 Jul 2022 23:20:33 -0400
Subject: [PATCH 14/28] Add files via upload

---
 .../designs/protolathe/designs_overrides.dm   | 57 +++++++++++++++++++
 .../designs/protolathe/designs_weapons.dm     | 39 +++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 mods/persistence/modules/fabrication/designs/protolathe/designs_overrides.dm
 create mode 100644 mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm

diff --git a/mods/persistence/modules/fabrication/designs/protolathe/designs_overrides.dm b/mods/persistence/modules/fabrication/designs/protolathe/designs_overrides.dm
new file mode 100644
index 00000000000..281b7820008
--- /dev/null
+++ b/mods/persistence/modules/fabrication/designs/protolathe/designs_overrides.dm
@@ -0,0 +1,57 @@
+// a set of bogus designs to disallow them from being researchable - primarily used for legacy guns, as there's no way to cleanly disallow existing recipes as of now
+
+/datum/fabricator_recipe/protolathe/weapon/rapidsyringe
+	required_technology = @"{'coding':999}"
+	path = /obj/item/gun/launcher/syringe/rapid
+
+/datum/fabricator_recipe/protolathe/weapon/temp_gun
+	required_technology = @"{'coding':999}"
+	path = /obj/item/gun/energy/temperature
+
+/datum/fabricator_recipe/protolathe/weapon/anti_photon
+	required_technology = @"{'coding':999}"
+	path = /obj/item/grenade/anti_photon
+
+/datum/fabricator_recipe/protolathe/weapon/advancedflash
+	required_technology = @"{'coding':999}"
+	path = /obj/item/flash/advanced
+
+/datum/fabricator_recipe/protolathe/weapon/confuseray
+	required_technology = @"{'coding':999}"
+	path = /obj/item/gun/energy/confuseray
+
+/datum/fabricator_recipe/protolathe/weapon/nuclear_gun
+	required_technology = @"{'coding':999}"
+	path = /obj/item/gun/energy/gun/nuclear
+
+/datum/fabricator_recipe/protolathe/weapon/lasercannon
+	required_technology = @"{'coding':999}"
+	path = /obj/item/gun/energy/lasercannon
+
+/datum/fabricator_recipe/protolathe/weapon/xrayrifle
+	required_technology = @"{'coding':999}"
+	path = /obj/item/gun/energy/xray
+
+/datum/fabricator_recipe/protolathe/weapon/grenadelauncher
+	required_technology = @"{'coding':999}"
+	path = /obj/item/gun/launcher/grenade
+
+/datum/fabricator_recipe/protolathe/weapon/flechette
+	required_technology = @"{'coding':999}"
+	path = /obj/item/gun/magnetic/railgun/flechette
+
+/datum/fabricator_recipe/protolathe/weapon/radpistol
+	required_technology = @"{'coding':999}"
+	path = /obj/item/gun/energy/toxgun
+
+/datum/fabricator_recipe/protolathe/weapon/decloner
+	required_technology = @"{'coding':999}"
+	path = /obj/item/gun/energy/decloner
+
+/datum/fabricator_recipe/protolathe/weapon/wt550
+	required_technology = @"{'coding':999}"
+	path = /obj/item/gun/projectile/automatic/smg
+
+/datum/fabricator_recipe/protolathe/weapon/bullpup
+	required_technology = @"{'coding':999}"
+	path = /obj/item/gun/projectile/automatic/assault_rifle
diff --git a/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm b/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm
new file mode 100644
index 00000000000..e4e8c362ab3
--- /dev/null
+++ b/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm
@@ -0,0 +1,39 @@
+// handmade tier (while not actually handmade, they're generally very cheap and use simple materials)
+
+/datum/fabricator_recipe/protolathe/weapon/tier0/bolt_action
+	path = /obj/item/gun/projectile/bolt_action/handmade/empty
+
+/datum/fabricator_recipe/protolathe/weapon/tier0/revolver
+	path = /obj/item/gun/projectile/revolver/handmade/empty
+
+/datum/fabricator_recipe/protolathe/weapon/tier0/shotgun
+	path = /obj/item/gun/projectile/shotgun/handmade/empty
+
+/datum/fabricator_recipe/protolathe/weapon/tier0/laser_rifle
+	path = /obj/item/gun/energy/laser/rifle/handmade
+
+// simple tier (most use at least a little bit of plasteel, aluminum, or titanium, but not much)
+
+/datum/fabricator_recipe/protolathe/weapon/tier1/bolt_action
+	path = /obj/item/gun/projectile/bolt_action/simple/empty
+
+/datum/fabricator_recipe/protolathe/weapon/tier1/pistol
+	path = /obj/item/gun/projectile/pistol/simple/empty
+
+/datum/fabricator_recipe/protolathe/weapon/tier1/pistol_golden
+	path = /obj/item/gun/projectile/pistol/simple/golden/empty
+
+/datum/fabricator_recipe/protolathe/weapon/tier1/revolver
+	path = /obj/item/gun/projectile/revolver/simple/empty
+
+/datum/fabricator_recipe/protolathe/weapon/tier1/shotgun_double
+	path = /obj/item/gun/projectile/shotgun/simple/empty
+
+/datum/fabricator_recipe/protolathe/weapon/tier1/shotgun_pump
+	path = /obj/item/gun/projectile/shotgun/pump/simple/empty
+
+/datum/fabricator_recipe/protolathe/weapon/tier1/laser_rifle
+	path = /obj/item/gun/energy/laser/rifle/simple
+
+/datum/fabricator_recipe/protolathe/weapon/tier1/laser_pistol
+	path = /obj/item/gun/energy/laser/pistol/simple
\ No newline at end of file

From e85a242161f5bc438e4aecb90104673c247a34d1 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 25 Jul 2022 23:26:06 -0400
Subject: [PATCH 15/28] Update designs_weapons.dm

---
 .../modules/fabrication/designs/protolathe/designs_weapons.dm   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm b/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm
index e4e8c362ab3..8c40598dc18 100644
--- a/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm
+++ b/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm
@@ -36,4 +36,4 @@
 	path = /obj/item/gun/energy/laser/rifle/simple
 
 /datum/fabricator_recipe/protolathe/weapon/tier1/laser_pistol
-	path = /obj/item/gun/energy/laser/pistol/simple
\ No newline at end of file
+	path = /obj/item/gun/energy/laser/pistol/simple

From 595c11fc5f0679d520c5044af73698b2164c9594 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 26 Jul 2022 14:31:10 -0400
Subject: [PATCH 16/28] Update designs_overrides.dm

---
 .../designs/protolathe/designs_overrides.dm   | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/mods/persistence/modules/fabrication/designs/protolathe/designs_overrides.dm b/mods/persistence/modules/fabrication/designs/protolathe/designs_overrides.dm
index 281b7820008..6eee6dece13 100644
--- a/mods/persistence/modules/fabrication/designs/protolathe/designs_overrides.dm
+++ b/mods/persistence/modules/fabrication/designs/protolathe/designs_overrides.dm
@@ -1,57 +1,57 @@
 // a set of bogus designs to disallow them from being researchable - primarily used for legacy guns, as there's no way to cleanly disallow existing recipes as of now
 
 /datum/fabricator_recipe/protolathe/weapon/rapidsyringe
-	required_technology = @"{'coding':999}"
+	required_technology = @"{'materials':999}"
 	path = /obj/item/gun/launcher/syringe/rapid
 
 /datum/fabricator_recipe/protolathe/weapon/temp_gun
-	required_technology = @"{'coding':999}"
+	required_technology = @"{'materials':999}"
 	path = /obj/item/gun/energy/temperature
 
 /datum/fabricator_recipe/protolathe/weapon/anti_photon
-	required_technology = @"{'coding':999}"
+	required_technology = @"{'materials':999}"
 	path = /obj/item/grenade/anti_photon
 
 /datum/fabricator_recipe/protolathe/weapon/advancedflash
-	required_technology = @"{'coding':999}"
+	required_technology = @"{'materials':999}"
 	path = /obj/item/flash/advanced
 
 /datum/fabricator_recipe/protolathe/weapon/confuseray
-	required_technology = @"{'coding':999}"
+	required_technology = @"{'materials':999}"
 	path = /obj/item/gun/energy/confuseray
 
 /datum/fabricator_recipe/protolathe/weapon/nuclear_gun
-	required_technology = @"{'coding':999}"
+	required_technology = @"{'materials':999}"
 	path = /obj/item/gun/energy/gun/nuclear
 
 /datum/fabricator_recipe/protolathe/weapon/lasercannon
-	required_technology = @"{'coding':999}"
+	required_technology = @"{'materials':999}"
 	path = /obj/item/gun/energy/lasercannon
 
 /datum/fabricator_recipe/protolathe/weapon/xrayrifle
-	required_technology = @"{'coding':999}"
+	required_technology = @"{'materials':999}"
 	path = /obj/item/gun/energy/xray
 
 /datum/fabricator_recipe/protolathe/weapon/grenadelauncher
-	required_technology = @"{'coding':999}"
+	required_technology = @"{'materials':999}"
 	path = /obj/item/gun/launcher/grenade
 
 /datum/fabricator_recipe/protolathe/weapon/flechette
-	required_technology = @"{'coding':999}"
+	required_technology = @"{'materials':999}"
 	path = /obj/item/gun/magnetic/railgun/flechette
 
 /datum/fabricator_recipe/protolathe/weapon/radpistol
-	required_technology = @"{'coding':999}"
+	required_technology = @"{'materials':999}"
 	path = /obj/item/gun/energy/toxgun
 
 /datum/fabricator_recipe/protolathe/weapon/decloner
-	required_technology = @"{'coding':999}"
+	required_technology = @"{'materials':999}"
 	path = /obj/item/gun/energy/decloner
 
 /datum/fabricator_recipe/protolathe/weapon/wt550
-	required_technology = @"{'coding':999}"
+	required_technology = @"{'materials':999}"
 	path = /obj/item/gun/projectile/automatic/smg
 
 /datum/fabricator_recipe/protolathe/weapon/bullpup
-	required_technology = @"{'coding':999}"
+	required_technology = @"{'materials':999}"
 	path = /obj/item/gun/projectile/automatic/assault_rifle

From aa06a250ca7638885700d715c0688b3343c10325 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 26 Jul 2022 16:05:55 -0400
Subject: [PATCH 17/28] protolathe can now use wood

---
 code/modules/fabrication/fabricator_protolathe.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/modules/fabrication/fabricator_protolathe.dm b/code/modules/fabrication/fabricator_protolathe.dm
index 711b4f71edf..f0c80b3ce33 100644
--- a/code/modules/fabrication/fabricator_protolathe.dm
+++ b/code/modules/fabrication/fabricator_protolathe.dm
@@ -17,5 +17,6 @@
 		/decl/material/solid/metal/gold =       SHEET_MATERIAL_AMOUNT * 100,
 		/decl/material/solid/metal/silver =     SHEET_MATERIAL_AMOUNT * 100,
 		/decl/material/solid/metal/uranium =    SHEET_MATERIAL_AMOUNT * 100,
-		/decl/material/solid/gemstone/diamond = SHEET_MATERIAL_AMOUNT * 100
-	)
\ No newline at end of file
+		/decl/material/solid/gemstone/diamond = SHEET_MATERIAL_AMOUNT * 100,
+		/decl/material/solid/wood = SHEET_MATERIAL_AMOUNT * 100
+	)

From 8b632806946c38b64c607338d53253893e9dd6cb Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 26 Jul 2022 16:23:04 -0400
Subject: [PATCH 18/28] Update fabricator_protolathe.dm

---
 code/modules/fabrication/fabricator_protolathe.dm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/modules/fabrication/fabricator_protolathe.dm b/code/modules/fabrication/fabricator_protolathe.dm
index f0c80b3ce33..34c1d245ff3 100644
--- a/code/modules/fabrication/fabricator_protolathe.dm
+++ b/code/modules/fabrication/fabricator_protolathe.dm
@@ -17,6 +17,5 @@
 		/decl/material/solid/metal/gold =       SHEET_MATERIAL_AMOUNT * 100,
 		/decl/material/solid/metal/silver =     SHEET_MATERIAL_AMOUNT * 100,
 		/decl/material/solid/metal/uranium =    SHEET_MATERIAL_AMOUNT * 100,
-		/decl/material/solid/gemstone/diamond = SHEET_MATERIAL_AMOUNT * 100,
-		/decl/material/solid/wood = SHEET_MATERIAL_AMOUNT * 100
+		/decl/material/solid/gemstone/diamond = SHEET_MATERIAL_AMOUNT * 100
 	)

From 05f9d6efae76d45b71006f34eb70f1c927e78f42 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 26 Jul 2022 16:24:18 -0400
Subject: [PATCH 19/28] Delete designs_overrides.dm

---
 .../designs/protolathe/designs_overrides.dm   | 57 -------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 mods/persistence/modules/fabrication/designs/protolathe/designs_overrides.dm

diff --git a/mods/persistence/modules/fabrication/designs/protolathe/designs_overrides.dm b/mods/persistence/modules/fabrication/designs/protolathe/designs_overrides.dm
deleted file mode 100644
index 6eee6dece13..00000000000
--- a/mods/persistence/modules/fabrication/designs/protolathe/designs_overrides.dm
+++ /dev/null
@@ -1,57 +0,0 @@
-// a set of bogus designs to disallow them from being researchable - primarily used for legacy guns, as there's no way to cleanly disallow existing recipes as of now
-
-/datum/fabricator_recipe/protolathe/weapon/rapidsyringe
-	required_technology = @"{'materials':999}"
-	path = /obj/item/gun/launcher/syringe/rapid
-
-/datum/fabricator_recipe/protolathe/weapon/temp_gun
-	required_technology = @"{'materials':999}"
-	path = /obj/item/gun/energy/temperature
-
-/datum/fabricator_recipe/protolathe/weapon/anti_photon
-	required_technology = @"{'materials':999}"
-	path = /obj/item/grenade/anti_photon
-
-/datum/fabricator_recipe/protolathe/weapon/advancedflash
-	required_technology = @"{'materials':999}"
-	path = /obj/item/flash/advanced
-
-/datum/fabricator_recipe/protolathe/weapon/confuseray
-	required_technology = @"{'materials':999}"
-	path = /obj/item/gun/energy/confuseray
-
-/datum/fabricator_recipe/protolathe/weapon/nuclear_gun
-	required_technology = @"{'materials':999}"
-	path = /obj/item/gun/energy/gun/nuclear
-
-/datum/fabricator_recipe/protolathe/weapon/lasercannon
-	required_technology = @"{'materials':999}"
-	path = /obj/item/gun/energy/lasercannon
-
-/datum/fabricator_recipe/protolathe/weapon/xrayrifle
-	required_technology = @"{'materials':999}"
-	path = /obj/item/gun/energy/xray
-
-/datum/fabricator_recipe/protolathe/weapon/grenadelauncher
-	required_technology = @"{'materials':999}"
-	path = /obj/item/gun/launcher/grenade
-
-/datum/fabricator_recipe/protolathe/weapon/flechette
-	required_technology = @"{'materials':999}"
-	path = /obj/item/gun/magnetic/railgun/flechette
-
-/datum/fabricator_recipe/protolathe/weapon/radpistol
-	required_technology = @"{'materials':999}"
-	path = /obj/item/gun/energy/toxgun
-
-/datum/fabricator_recipe/protolathe/weapon/decloner
-	required_technology = @"{'materials':999}"
-	path = /obj/item/gun/energy/decloner
-
-/datum/fabricator_recipe/protolathe/weapon/wt550
-	required_technology = @"{'materials':999}"
-	path = /obj/item/gun/projectile/automatic/smg
-
-/datum/fabricator_recipe/protolathe/weapon/bullpup
-	required_technology = @"{'materials':999}"
-	path = /obj/item/gun/projectile/automatic/assault_rifle

From fbb636568b8176112cb607f0d11cb564a5b9ff00 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 26 Jul 2022 16:29:06 -0400
Subject: [PATCH 20/28] protolathe override

---
 .../modules/fabrication/fabricator_protolathe.dm  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 mods/persistence/modules/fabrication/fabricator_protolathe.dm

diff --git a/mods/persistence/modules/fabrication/fabricator_protolathe.dm b/mods/persistence/modules/fabrication/fabricator_protolathe.dm
new file mode 100644
index 00000000000..c8073b99247
--- /dev/null
+++ b/mods/persistence/modules/fabrication/fabricator_protolathe.dm
@@ -0,0 +1,15 @@
+/obj/machinery/fabricator/protolathe
+	base_storage_capacity = list(
+		/decl/material/solid/metal/steel =      SHEET_MATERIAL_AMOUNT * 100,
+		/decl/material/solid/metal/aluminium =  SHEET_MATERIAL_AMOUNT * 100,
+		/decl/material/solid/plastic =          SHEET_MATERIAL_AMOUNT * 100,
+		/decl/material/solid/glass =            SHEET_MATERIAL_AMOUNT * 100,
+		/decl/material/solid/fiberglass =       SHEET_MATERIAL_AMOUNT * 100,
+		/decl/material/solid/metal/gold =       SHEET_MATERIAL_AMOUNT * 100,
+		/decl/material/solid/metal/silver =     SHEET_MATERIAL_AMOUNT * 100,
+		/decl/material/solid/metal/uranium =    SHEET_MATERIAL_AMOUNT * 100,
+		/decl/material/solid/gemstone/diamond = SHEET_MATERIAL_AMOUNT * 100,
+		/decl/material/solid/wood = SHEET_MATERIAL_AMOUNT * 100
+	)
+
+// override to allow protolathes to accept wood - used for gunsmithing
\ No newline at end of file

From 967f7d20fb1b347b6b7e36706be4a376510ccc51 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 26 Jul 2022 16:30:13 -0400
Subject: [PATCH 21/28] Add files via upload

---
 .../modules/projectiles/overrides.dm          | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 mods/persistence/modules/projectiles/overrides.dm

diff --git a/mods/persistence/modules/projectiles/overrides.dm b/mods/persistence/modules/projectiles/overrides.dm
new file mode 100644
index 00000000000..93a95082b62
--- /dev/null
+++ b/mods/persistence/modules/projectiles/overrides.dm
@@ -0,0 +1,40 @@
+// bogus material tech for items in order to prevent them from being researchable
+
+/obj/item/gun/launcher/syringe/rapid
+	origin_tech = "{'shitcode':1337}"
+
+/obj/item/gun/energy/temperature
+	origin_tech = "{'shitcode':1337}"
+
+/obj/item/grenade/anti_photon
+	origin_tech = "{'shitcode':1337}"
+
+/obj/item/gun/energy/confuseray
+	origin_tech = "{'shitcode':1337}"
+
+/obj/item/gun/energy/gun/nuclear
+	origin_tech = "{'shitcode':1337}"
+
+/obj/item/gun/energy/lasercannon
+	origin_tech = "{'shitcode':1337}"
+
+/obj/item/gun/energy/xray
+	origin_tech = "{'shitcode':1337}"
+
+/obj/item/gun/launcher/grenade
+	origin_tech = "{'shitcode':1337}"
+
+/obj/item/gun/magnetic/railgun/flechette
+	origin_tech = "{'shitcode':1337}"
+
+/obj/item/gun/energy/toxgun
+	origin_tech = "{'shitcode':1337}"
+
+/obj/item/gun/energy/decloner
+	origin_tech = "{'shitcode':1337}"
+
+/obj/item/gun/projectile/automatic/smg
+	origin_tech = "{'shitcode':1337}"
+
+/obj/item/gun/projectile/automatic/assault_rifle
+	origin_tech = "{'shitcode':1337}"
\ No newline at end of file

From 6f6feaac06af151fae6cab481ed79e0de63ca77c Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 26 Jul 2022 16:31:14 -0400
Subject: [PATCH 22/28] Update _persistence.dme

---
 mods/persistence/_persistence.dme | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme
index d7df2d3eed7..ae07eb8d573 100644
--- a/mods/persistence/_persistence.dme
+++ b/mods/persistence/_persistence.dme
@@ -215,6 +215,7 @@
 #include "modules\projectiles\guns\projectile\tier1\revolver.dm"
 #include "modules\projectiles\guns\projectile\tier1\shotgun_db.dm"
 #include "modules\projectiles\guns\projectile\tier1\shotgun_pump.dm"
+#include "modules\projectiles\overrides.dm"
 #include "modules\reagents\Chemistry-Holder.dm"
 #include "modules\reagents\chems\chems.dm"
 #include "modules\reagents\chems\recipes.dm"

From 7988995382fb20dd4e3d304236fd4bc63e3abfab Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 26 Jul 2022 16:32:06 -0400
Subject: [PATCH 23/28] Update _persistence.dme

---
 mods/persistence/_persistence.dme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme
index ae07eb8d573..c2ecc6da914 100644
--- a/mods/persistence/_persistence.dme
+++ b/mods/persistence/_persistence.dme
@@ -121,8 +121,8 @@
 #include "modules\fabrication\_fabricator.dm"
 #include "modules\fabrication\fabricator_build.dm"
 #include "modules\fabrication\fabricator_intake.dm"
+#include "modules\fabrication\fabricator_protolathe.dm"
 #include "modules\fabrication\designs\textile\space.dm"
-#include "modules\fabrication\designs\protolathe\designs_overrides.dm"
 #include "modules\fabrication\designs\protolathe\designs_weapons.dm"
 #include "modules\hydroponics\grown.dm"
 #include "modules\hydroponics\grown_indedible.dm"

From 31b40257e2e96df1d43d5ebbe295840a4d9cb46f Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 26 Jul 2022 16:33:57 -0400
Subject: [PATCH 24/28] revert original nebula protolathe file


From aa54eda493c93bd6387bd49b39edd60c85ed02da Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 26 Jul 2022 16:34:21 -0400
Subject: [PATCH 25/28] Update fabricator_protolathe.dm


From 8ade556852479a1e2445e0f622230502366b608a Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 26 Jul 2022 16:43:56 -0400
Subject: [PATCH 26/28] Update fabricator_protolathe.dm

---
 .../persistence/modules/fabrication/fabricator_protolathe.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mods/persistence/modules/fabrication/fabricator_protolathe.dm b/mods/persistence/modules/fabrication/fabricator_protolathe.dm
index c8073b99247..84d3c03da1e 100644
--- a/mods/persistence/modules/fabrication/fabricator_protolathe.dm
+++ b/mods/persistence/modules/fabrication/fabricator_protolathe.dm
@@ -2,6 +2,7 @@
 	base_storage_capacity = list(
 		/decl/material/solid/metal/steel =      SHEET_MATERIAL_AMOUNT * 100,
 		/decl/material/solid/metal/aluminium =  SHEET_MATERIAL_AMOUNT * 100,
+		/decl/material/solid/metal/titanium =   SHEET_MATERIAL_AMOUNT * 100,
 		/decl/material/solid/plastic =          SHEET_MATERIAL_AMOUNT * 100,
 		/decl/material/solid/glass =            SHEET_MATERIAL_AMOUNT * 100,
 		/decl/material/solid/fiberglass =       SHEET_MATERIAL_AMOUNT * 100,
@@ -9,7 +10,7 @@
 		/decl/material/solid/metal/silver =     SHEET_MATERIAL_AMOUNT * 100,
 		/decl/material/solid/metal/uranium =    SHEET_MATERIAL_AMOUNT * 100,
 		/decl/material/solid/gemstone/diamond = SHEET_MATERIAL_AMOUNT * 100,
-		/decl/material/solid/wood = SHEET_MATERIAL_AMOUNT * 100
+		/decl/material/solid/wood =             SHEET_MATERIAL_AMOUNT * 100
 	)
 
-// override to allow protolathes to accept wood - used for gunsmithing
\ No newline at end of file
+// override to allow protolathes to accept wood + titanium - used for gunsmithing

From f64dd0588214ca714fef0f950bd3015e50a328f1 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 26 Jul 2022 16:44:26 -0400
Subject: [PATCH 27/28] Update shotgun_pump.dm

---
 .../modules/projectiles/guns/projectile/tier1/shotgun_pump.dm   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm
index 39728aa3903..dc62b6b0d1a 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm
@@ -16,7 +16,7 @@
 	material = /decl/material/solid/metal/steel
 	matter = list(
 		/decl/material/solid/wood = MATTER_AMOUNT_TRACE,
-		/decl/material/solid/metal/plasteel = MATTER_AMOUNT_TRACE
+		/decl/material/solid/metal/titanium = MATTER_AMOUNT_TRACE
 	)
 
 /obj/item/gun/projectile/shotgun/pump/simple/empty

From fd82afd2500e7b9aa023b55686a19088708d4c2a Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 26 Jul 2022 16:46:38 -0400
Subject: [PATCH 28/28] Update overrides.dm

---
 .../modules/projectiles/overrides.dm          | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/mods/persistence/modules/projectiles/overrides.dm b/mods/persistence/modules/projectiles/overrides.dm
index 93a95082b62..ff08dff48c4 100644
--- a/mods/persistence/modules/projectiles/overrides.dm
+++ b/mods/persistence/modules/projectiles/overrides.dm
@@ -1,40 +1,40 @@
 // bogus material tech for items in order to prevent them from being researchable
 
 /obj/item/gun/launcher/syringe/rapid
-	origin_tech = "{'shitcode':1337}"
+	origin_tech = "{'wormholes':1337}"
 
 /obj/item/gun/energy/temperature
-	origin_tech = "{'shitcode':1337}"
+	origin_tech = "{'wormholes':1337}"
 
 /obj/item/grenade/anti_photon
-	origin_tech = "{'shitcode':1337}"
+	origin_tech = "{'wormholes':1337}"
 
 /obj/item/gun/energy/confuseray
-	origin_tech = "{'shitcode':1337}"
+	origin_tech = "{'wormholes':1337}"
 
 /obj/item/gun/energy/gun/nuclear
-	origin_tech = "{'shitcode':1337}"
+	origin_tech = "{'wormholes':1337}"
 
 /obj/item/gun/energy/lasercannon
-	origin_tech = "{'shitcode':1337}"
+	origin_tech = "{'wormholes':1337}"
 
 /obj/item/gun/energy/xray
-	origin_tech = "{'shitcode':1337}"
+	origin_tech = "{'wormholes':1337}"
 
 /obj/item/gun/launcher/grenade
-	origin_tech = "{'shitcode':1337}"
+	origin_tech = "{'wormholes':1337}"
 
 /obj/item/gun/magnetic/railgun/flechette
-	origin_tech = "{'shitcode':1337}"
+	origin_tech = "{'wormholes':1337}"
 
 /obj/item/gun/energy/toxgun
-	origin_tech = "{'shitcode':1337}"
+	origin_tech = "{'wormholes':1337}"
 
 /obj/item/gun/energy/decloner
-	origin_tech = "{'shitcode':1337}"
+	origin_tech = "{'wormholes':1337}"
 
 /obj/item/gun/projectile/automatic/smg
-	origin_tech = "{'shitcode':1337}"
+	origin_tech = "{'wormholes':1337}"
 
 /obj/item/gun/projectile/automatic/assault_rifle
-	origin_tech = "{'shitcode':1337}"
\ No newline at end of file
+	origin_tech = "{'wormholes':1337}"