From 9dab1874d5b9dd7cde5293c0ed3ca924aa29af67 Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 00:53:08 -0400 Subject: [PATCH 01/42] printable-guns --- mods/persistence/_persistence.dme | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme index 367166e3ca7..28d00ed6315 100644 --- a/mods/persistence/_persistence.dme +++ b/mods/persistence/_persistence.dme @@ -131,7 +131,9 @@ #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_weapons.dm" #include "modules\hydroponics\grown.dm" #include "modules\hydroponics\grown_indedible.dm" #include "modules\hydroponics\seed_machines.dm" @@ -235,6 +237,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 95b9a3f04db78cb20993a7debfec1c9fe08e87d2 Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 00:54:57 -0400 Subject: [PATCH 02/42] Add files via upload --- .../protolathe/weapons/designs_weapons.dm | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 mods/persistence/modules/fabrication/designs/protolathe/weapons/designs_weapons.dm diff --git a/mods/persistence/modules/fabrication/designs/protolathe/weapons/designs_weapons.dm b/mods/persistence/modules/fabrication/designs/protolathe/weapons/designs_weapons.dm new file mode 100644 index 00000000000..4825226b56b --- /dev/null +++ b/mods/persistence/modules/fabrication/designs/protolathe/weapons/designs_weapons.dm @@ -0,0 +1,35 @@ +/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 + +/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 22c4280f0cadca6d221bce5d517a21af98b1f754 Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 00:56:44 -0400 Subject: [PATCH 03/42] Delete mods/persistence/modules/fabrication/designs/protolathe/weapons directory --- .../protolathe/weapons/designs_weapons.dm | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 mods/persistence/modules/fabrication/designs/protolathe/weapons/designs_weapons.dm diff --git a/mods/persistence/modules/fabrication/designs/protolathe/weapons/designs_weapons.dm b/mods/persistence/modules/fabrication/designs/protolathe/weapons/designs_weapons.dm deleted file mode 100644 index 4825226b56b..00000000000 --- a/mods/persistence/modules/fabrication/designs/protolathe/weapons/designs_weapons.dm +++ /dev/null @@ -1,35 +0,0 @@ -/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 - -/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 1782e39c0f2bffce007d2a9872894e76f1c6cebd Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 00:57:16 -0400 Subject: [PATCH 04/42] Add files via upload --- .../designs/protolathe/designs_weapons.dm | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm 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..4825226b56b --- /dev/null +++ b/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm @@ -0,0 +1,35 @@ +/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 + +/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 895a734b0e3ae525ce6cd6ae1d72f1cf5df00ee0 Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 01:00:08 -0400 Subject: [PATCH 05/42] Add files via upload --- .../modules/fabrication/fabricator_protolathe.dm | 14 ++++++++++++++ 1 file changed, 14 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..f7010eaf49c --- /dev/null +++ b/mods/persistence/modules/fabrication/fabricator_protolathe.dm @@ -0,0 +1,14 @@ +/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/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, + /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 + ) \ No newline at end of file From 1b4fb9edef9afb047d1d388615e8618105cf618e Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 01:00:54 -0400 Subject: [PATCH 06/42] 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 2aa7f84ebfcfec5d566aa219b2bacf910b19a94c Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 01:17:12 -0400 Subject: [PATCH 07/42] 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 af5f66b6061b59c4b79eec69a45eec59740c46d7 Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 01:17:24 -0400 Subject: [PATCH 08/42] Update lasrifle.dm --- .../modules/projectiles/guns/energy/tier1/lasrifle.dm | 4 ++-- 1 file changed, 2 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..05f3e3511ce 100644 --- a/mods/persistence/modules/projectiles/guns/energy/tier1/lasrifle.dm +++ b/mods/persistence/modules/projectiles/guns/energy/tier1/lasrifle.dm @@ -3,10 +3,10 @@ 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 From efb6ce8fc08aeae8c2a4984636c822d848d4984d Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 01:18:10 -0400 Subject: [PATCH 09/42] Update lasrifle.dm --- .../modules/projectiles/guns/energy/tier1/lasrifle.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mods/persistence/modules/projectiles/guns/energy/tier1/lasrifle.dm b/mods/persistence/modules/projectiles/guns/energy/tier1/lasrifle.dm index 05f3e3511ce..8f17ee2c69f 100644 --- a/mods/persistence/modules/projectiles/guns/energy/tier1/lasrifle.dm +++ b/mods/persistence/modules/projectiles/guns/energy/tier1/lasrifle.dm @@ -10,3 +10,9 @@ force = 10 origin_tech = "{'combat':3,'magnets':2,'engineering':2,'materials':3}" 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 5d03215709b5756d5e7cc39a89ba898abb58186c Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 01:18:47 -0400 Subject: [PATCH 10/42] Update boltaction.dm --- .../modules/projectiles/guns/projectile/tier0/boltaction.dm | 6 +++++- 1 file changed, 5 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..f7acfda2059 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm @@ -13,6 +13,10 @@ 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 cb5b46d65cad80d825a9b0f30e83ea590e683e8b Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 01:19:16 -0400 Subject: [PATCH 11/42] 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 71df64fa57160dda9a1cafa4a53c4e98d70295a6 Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 01:19:31 -0400 Subject: [PATCH 12/42] 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 bee411628e07bcc9966ee56e0e3dc301763b9a3e Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 01:19:58 -0400 Subject: [PATCH 13/42] 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 f5eb2a6d3c43181bf894ec6f6073514bddce3866 Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 01:20:30 -0400 Subject: [PATCH 14/42] 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 6ded0fbc6adc39baef7f30e4d9536f6cc8c9ee3c Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 01:21:01 -0400 Subject: [PATCH 15/42] 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..7e79cefcb9f 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}" + 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 ea895624d4d4b2921d5a45ba4b505cc759c89e3b Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 01:21:23 -0400 Subject: [PATCH 16/42] 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 aa1af12d47e4b20960a52de581bd1d7015477083 Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 01:23:12 -0400 Subject: [PATCH 17/42] Update shotgun_db.dm --- .../guns/projectile/tier1/shotgun_db.dm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) 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..200f1beb6dd 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/shotgun/simple name = "ZSS SG 'Bouncer'" - desc = "The Bouncer, also known simply as 'the Double-Barrel', is essentially a rifle butt with two pipes attached to it. Somehow, this proved to be an immensely effective, powerful, and decidedly badass weapon. This model can be configured to fire one or both barrels at a time, and cannot be sawn off due to sporting reinforced barrels. It's often used by angry barkeeps and deranged space marines. Chambered in 12g shells." + desc = "The Bouncer, also known simply as 'the Double-Barrel', is essentially a rifle butt with two pipes attached to it. This proves to be immensely effective as a shotgun. This model can be configured to fire one or both barrels at a time, and cannot be sawn off due to sporting reinforced barrels. It's often used by angry barkeeps and deranged space marines. Chambered in 12g shells." icon = 'mods/persistence/icons/obj/guns/tier1/shotgun_db.dmi' load_method = SINGLE_CASING handle_casings = HOLD_CASINGS @@ -13,13 +13,17 @@ ammo_type = /obj/item/ammo_casing/shotgun/beanbag 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 - + one_hand_penalty = 10 + 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( list(mode_name="fire one barrel at a time", burst=1), list(mode_name="fire both barrels at once", burst=2), - ) + ) /obj/item/gun/projectile/shotgun/simple/empty - starts_loaded = FALSE \ No newline at end of file + starts_loaded = FALSE From 5c4bdffcfc526fa781366646d66bd35f8bae55eb Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 01:23:26 -0400 Subject: [PATCH 18/42] Update shotgun_db.dm --- .../modules/projectiles/guns/projectile/tier1/shotgun_db.dm | 2 +- 1 file changed, 1 insertion(+), 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 200f1beb6dd..78ba049e99e 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm @@ -22,7 +22,7 @@ burst_delay = 0 firemodes = list( list(mode_name="fire one barrel at a time", burst=1), - list(mode_name="fire both barrels at once", burst=2), + list(mode_name="fire both barrels at once", burst=2) ) /obj/item/gun/projectile/shotgun/simple/empty From a6ed059aa42da51e36b6ba9238d1d008eda4683d Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 01:23:50 -0400 Subject: [PATCH 19/42] 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..dc62b6b0d1a 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/titanium = MATTER_AMOUNT_TRACE + ) /obj/item/gun/projectile/shotgun/pump/simple/empty starts_loaded = FALSE From db2083663e495e746fdbd9c10c68806f4fab8058 Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Sat, 8 Jul 2023 01:24:23 -0400 Subject: [PATCH 20/42] Create overrides.dm --- .../modules/projectiles/overrides.dm | 38 +++++++++++++++++++ 1 file changed, 38 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..37f18ab6b8b --- /dev/null +++ b/mods/persistence/modules/projectiles/overrides.dm @@ -0,0 +1,38 @@ +/obj/item/gun/launcher/syringe/rapid + origin_tech = "{'wormholes':1337}" + +/obj/item/gun/energy/temperature + origin_tech = "{'wormholes':1337}" + +/obj/item/grenade/anti_photon + origin_tech = "{'wormholes':1337}" + +/obj/item/gun/energy/confuseray + origin_tech = "{'wormholes':1337}" + +/obj/item/gun/energy/gun/nuclear + origin_tech = "{'wormholes':1337}" + +/obj/item/gun/energy/lasercannon + origin_tech = "{'wormholes':1337}" + +/obj/item/gun/energy/xray + origin_tech = "{'wormholes':1337}" + +/obj/item/gun/launcher/grenade + origin_tech = "{'wormholes':1337}" + +/obj/item/gun/magnetic/railgun/flechette + origin_tech = "{'wormholes':1337}" + +/obj/item/gun/energy/toxgun + origin_tech = "{'wormholes':1337}" + +/obj/item/gun/energy/decloner + origin_tech = "{'wormholes':1337}" + +/obj/item/gun/projectile/automatic/smg + origin_tech = "{'wormholes':1337}" + +/obj/item/gun/projectile/automatic/assault_rifle + origin_tech = "{'wormholes':1337}" From f3172091daece3a0a925907120dbde6e4f35c7cc Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again Date: Sat, 8 Jul 2023 01:42:38 -0400 Subject: [PATCH 21/42] updates Stuff --- .../designs/protolathe/designs_weapons.dm | 68 +++++++++---------- .../fabrication/fabricator_protolathe.dm | 26 +++---- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm b/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm index 4825226b56b..f426b92c8cf 100644 --- a/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm +++ b/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm @@ -1,35 +1,35 @@ -/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 - -/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 +/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 + +/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 diff --git a/mods/persistence/modules/fabrication/fabricator_protolathe.dm b/mods/persistence/modules/fabrication/fabricator_protolathe.dm index f7010eaf49c..605b8501ec4 100644 --- a/mods/persistence/modules/fabrication/fabricator_protolathe.dm +++ b/mods/persistence/modules/fabrication/fabricator_protolathe.dm @@ -1,14 +1,14 @@ -/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/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, - /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 +/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/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, + /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 ) \ No newline at end of file From 0de76cb31bcc571d136222141caacdbf360b468e 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, 10 Jul 2023 03:04:24 -0400 Subject: [PATCH 22/42] Update boltaction.dm --- .../modules/projectiles/guns/projectile/tier0/boltaction.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm index f7acfda2059..e4c46f05a91 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/bolt_action/handmade - name = "HM BA 'Minuteman'" - desc = "A homemade bolt-action rifle of dubious quality. While it can chamber high-damage ammunition, it's difficult to load and rather inaccurate for a rifle. It's still favored by colonists for being effective for its low cost. Chambered in 5.56mm rounds." + name = "5.56 'Minuteman' BA" + desc = "Bolt-action rifle of dubious origin. Shoddy craftsmanship results in extremely low ammo capacity. Chambered in 5.56." icon = 'mods/persistence/icons/obj/guns/tier0/boltaction.dmi' force = 10 slot_flags = SLOT_BACK From 2463bbd6efd24b0c6ebd797bc00653d61b574d05 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, 10 Jul 2023 03:06:28 -0400 Subject: [PATCH 23/42] Update revolver.dm --- .../modules/projectiles/guns/projectile/tier0/revolver.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm index d126c062ee5..028176b03c7 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/revolver/handmade - name = "HM R 'Underdog'" - desc = "A jury-rigged weapon fashioned not too dissimilarly to a revolver. While usable one-handed, it doesn't lend itself to it. Chambered in 10mm rounds." + name = "10mm 'Underdog' RV" + desc = "Revolver of dubious origin. Shoddy craftsmanship results in low ammo capacity and high recoil. Chambered in 10mm." icon = 'mods/persistence/icons/obj/guns/tier0/revolver.dmi' origin_tech = "{'combat':2,'engineering':1,'materials':1}" caliber = CALIBER_PISTOL From eff7476f4c15a3d74608c394bc5ef9329930be59 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, 10 Jul 2023 03:08:09 -0400 Subject: [PATCH 24/42] Update shotgun.dm --- .../modules/projectiles/guns/projectile/tier0/shotgun.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm index fa6af11180f..839c2a8d6f1 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/shotgun/handmade - name = "HM SG 'Slider'" - desc = "A simple single-barrel shotgun made from a pipe and some spare parts. Inaccurate and sports nigh-unmanageable recoil. Chambered in 12g shells." + name = "12g 'Slider' SG" + desc = "Break-action shotgun of dubious origin. Shoddy craftsmanship results in extremely low ammo capacity and high recoil. Chambered in 12 gauge." icon = 'mods/persistence/icons/obj/guns/tier0/shotgun.dmi' load_method = SINGLE_CASING handle_casings = HOLD_CASINGS From 6935a1ed87f240770c6b5bd88c34e2858f4af7b3 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, 10 Jul 2023 03:09:59 -0400 Subject: [PATCH 25/42] Update boltaction.dm --- .../modules/projectiles/guns/projectile/tier1/boltaction.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm index 73e1e102797..202c4d3451d 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/bolt_action/simple - name = "ZSS BA 'Mosin'" - desc = "The Mosin model is a particularly ancient design. Very little is known about its origins, but in the modern day Mosin models are mostly produced for hunting purposes. However, due to its ease of production and decent loading capacity, many colonist and rebel groups use Mosin rifles in their armies. Chambered in 5.56mm rounds." + name = "5.56 'Mosin' BA" + desc = "Bolt-action rifle of ancient design. Reliable, but slow-firing. Chambered in 5.56." icon = 'mods/persistence/icons/obj/guns/tier1/boltaction.dmi' force = 10 slot_flags = SLOT_BACK From d606e08034341f0c74f4e6b30d19f5f90eee5f0b 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, 10 Jul 2023 03:11:28 -0400 Subject: [PATCH 26/42] Update pistol.dm --- .../modules/projectiles/guns/projectile/tier1/pistol.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm index e085e70d289..517db03dcd5 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/pistol/simple - name = "ZSS HG 'Colt'" - desc = "Nobody knows who 'Colt' actually was, but historians generally believe he was a master gunsmith from the ancient past. The 'Colt' pistol is one of his most well-known designs. Because the design to make this model was cracked decades ago, many groups have made their own bastardized versions of the firearm. This one in particular is chambered in 10mm rounds." + name = "10mm 'Colt' HG" + desc = "Pistol of ancient design. Reliable, but struggles against armored targets. Chambered in 10mm." icon = 'mods/persistence/icons/obj/guns/tier1/pistol.dmi' fire_delay = 5 force = 5 From 4a150d8948c1352f03507a5ffdf9cf3f390409a3 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, 10 Jul 2023 03:13:09 -0400 Subject: [PATCH 27/42] Update pistol_gold.dm --- .../modules/projectiles/guns/projectile/tier1/pistol_gold.dm | 4 ++-- 1 file changed, 2 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 7e79cefcb9f..c5b171d07dd 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/pistol/simple/golden - 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." + name = "10mm 'Colt-M' HG" + desc = "Luxurious pistol of ancient design. Reliable and fabulous, but struggles against armor. Chambered in 10mm." icon = 'mods/persistence/icons/obj/guns/tier1/pistol_gold.dmi' origin_tech = "{'combat':3,'engineering':2,'materials':5}" material = /decl/material/solid/metal/steel From 02e7aadf1b5142b00327aa5ddeb84e39f09c7363 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, 10 Jul 2023 03:13:24 -0400 Subject: [PATCH 28/42] Update pistol_gold.dm --- .../modules/projectiles/guns/projectile/tier1/pistol_gold.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c5b171d07dd..13b63862984 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/pistol/simple/golden name = "10mm 'Colt-M' HG" - desc = "Luxurious pistol of ancient design. Reliable and fabulous, but struggles against armor. Chambered in 10mm." + desc = "Luxurious pistol of ancient design. Reliable and fabulous, but struggles against armored targets. Chambered in 10mm." icon = 'mods/persistence/icons/obj/guns/tier1/pistol_gold.dmi' origin_tech = "{'combat':3,'engineering':2,'materials':5}" material = /decl/material/solid/metal/steel From 05c38d65e184ef1fd9cf2f4c26074eaef5321511 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, 10 Jul 2023 03:15:18 -0400 Subject: [PATCH 29/42] Update revolver.dm --- .../modules/projectiles/guns/projectile/tier1/revolver.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm index 6f4e95ed97c..4369159ffa4 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/revolver/simple - name = "ZSS R 'Chief'" - desc = "A pocket revolver of ancient design intended for use by ground police forces and for civilian self-defense. The Chief model is known as a reliable weapon galaxy-wide, though its use of pistol rounds leaves it lacking in stopping power. Chambered in 10mm rounds." + name = "10mm 'Chief' RV" + desc = "Revolver of ancient design. Reliable, but struggles against armored targets. Chambered in 10mm." icon = 'mods/persistence/icons/obj/guns/tier1/revolver.dmi' origin_tech = "{'combat':3,'engineering':2,'materials':2}" caliber = CALIBER_PISTOL From d281f47d17efb49cc6dc122fcb14d91479572e60 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, 10 Jul 2023 03:17:25 -0400 Subject: [PATCH 30/42] Update shotgun_db.dm --- .../modules/projectiles/guns/projectile/tier1/shotgun_db.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 78ba049e99e..90e12a57390 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/shotgun/simple - name = "ZSS SG 'Bouncer'" - desc = "The Bouncer, also known simply as 'the Double-Barrel', is essentially a rifle butt with two pipes attached to it. This proves to be immensely effective as a shotgun. This model can be configured to fire one or both barrels at a time, and cannot be sawn off due to sporting reinforced barrels. It's often used by angry barkeeps and deranged space marines. Chambered in 12g shells." + name = "12g 'Bouncer' SG" + desc = "Break-action shotgun of ancient design. Powerful, but struggles in prolonged engagements due to low ammo capacity. Can fire one or both chambers at a time. Chambered in 12 gauge." icon = 'mods/persistence/icons/obj/guns/tier1/shotgun_db.dmi' load_method = SINGLE_CASING handle_casings = HOLD_CASINGS From f248641b352e39b02df9efcf4d2aecb1cd666ff0 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, 10 Jul 2023 03:19:30 -0400 Subject: [PATCH 31/42] Update shotgun_pump.dm --- .../modules/projectiles/guns/projectile/tier1/shotgun_pump.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 dc62b6b0d1a..2a3034cb96d 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/shotgun/pump/simple - name = "ZSS SG 'Teufort'" - desc = "A straightforward pump-action shotgun intended for hunting medium-sized game. The Teufort isn't one of the first or best pump shotguns to exist, but its fairly cheap for how effective it is. Chambered in 12g shells." + name = "12g 'Teufort' SG" + desc = "Pump-action shotgun of ancient design. Powerful, but fires slowly due to pump-action mechanism and high recoil. Chambered in 12 gauge." icon = 'mods/persistence/icons/obj/guns/tier1/shotgun_pump.dmi' max_shells = 5 fire_delay = 12 From 7db2021b70b5bd10f59328ac4513ea7dc148af60 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, 10 Jul 2023 03:26:55 -0400 Subject: [PATCH 32/42] Update lasrifle.dm --- .../modules/projectiles/guns/energy/tier0/lasrifle.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm b/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm index d8eff9318be..f231acea081 100644 --- a/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm +++ b/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm @@ -1,6 +1,6 @@ /obj/item/gun/energy/laser/rifle/handmade - name = "HM LR 'Tagger'" - desc = "A cobbled-together mass of electronic components, duct tape, and hope. However, unlike most laser rifles, this model is small enough to wear around the waist. Sports dreadful ammo capacity compared to ballistic weapons but its ease of recharging makes it favored among the poor." + name = "Laser 'Tagger' LG" + desc = "Energy rifle of dubious origin. Shoddy craftsmanship results in low charge capacity and weak output. Fires laser beams." icon = 'mods/persistence/icons/obj/guns/tier0/lasrifle.dmi' slot_flags = SLOT_LOWER_BODY|SLOT_BACK w_class = ITEM_SIZE_LARGE From e66804661362fd88ade4fa0fa4a0641f9b055e91 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, 10 Jul 2023 03:28:34 -0400 Subject: [PATCH 33/42] Update laspistol.dm --- .../modules/projectiles/guns/energy/tier1/laspistol.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/persistence/modules/projectiles/guns/energy/tier1/laspistol.dm b/mods/persistence/modules/projectiles/guns/energy/tier1/laspistol.dm index f824c4962f6..1679f022e82 100644 --- a/mods/persistence/modules/projectiles/guns/energy/tier1/laspistol.dm +++ b/mods/persistence/modules/projectiles/guns/energy/tier1/laspistol.dm @@ -1,6 +1,6 @@ /obj/item/gun/energy/laser/pistol/simple - name = "ZSS LP 'Settler'" - desc = "The Settler model is one of the first ever mass-produced laser weapons intended for civilian use. It has an impressive capacity for its low cost and is small enough to be slung around the belt. Its low stopping power didn't deter most civilians from purchasing the pistol en masse." + name = "Laser 'Settler' EG" + desc = "Energy gun used by modern spacers. Compact, but suffers from low charge capacity because of this. Fires Alpha-type laser beams." icon = 'mods/persistence/icons/obj/guns/tier1/laspistol.dmi' slot_flags = SLOT_LOWER_BODY w_class = ITEM_SIZE_NORMAL From 78aeac1c7596d86d8c42ecf21a9c01759e95689f 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, 10 Jul 2023 03:28:52 -0400 Subject: [PATCH 34/42] Update lasrifle.dm --- .../modules/projectiles/guns/energy/tier0/lasrifle.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm b/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm index f231acea081..ba0c2aeda1c 100644 --- a/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm +++ b/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm @@ -1,6 +1,6 @@ /obj/item/gun/energy/laser/rifle/handmade - name = "Laser 'Tagger' LG" - desc = "Energy rifle of dubious origin. Shoddy craftsmanship results in low charge capacity and weak output. Fires laser beams." + name = "Laser 'Tagger' EG" + desc = "Energy rifle of dubious origin. Shoddy craftsmanship results in low charge capacity and weak output. Fires Alpha-type laser beams." icon = 'mods/persistence/icons/obj/guns/tier0/lasrifle.dmi' slot_flags = SLOT_LOWER_BODY|SLOT_BACK w_class = ITEM_SIZE_LARGE From 4052e00fb5c3cf1844008daf3bf03a87b93ddee4 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, 10 Jul 2023 03:30:33 -0400 Subject: [PATCH 35/42] Update lasrifle.dm --- .../modules/projectiles/guns/energy/tier1/lasrifle.dm | 4 ++-- 1 file changed, 2 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 8f17ee2c69f..ba591e5bf84 100644 --- a/mods/persistence/modules/projectiles/guns/energy/tier1/lasrifle.dm +++ b/mods/persistence/modules/projectiles/guns/energy/tier1/lasrifle.dm @@ -1,6 +1,6 @@ /obj/item/gun/energy/laser/rifle/simple - name = "ZSS LR 'Marine'" - 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." + name = "Laser 'Marine' EG" + desc = "Laser rifle used by modern spacers. Powerful, but bulky and suffers from low charge capacity. Fires Beta-type laser beams." icon = 'mods/persistence/icons/obj/guns/tier1/lasrifle.dmi' slot_flags = SLOT_BACK w_class = ITEM_SIZE_HUGE From 4b2f3223e78e08dae19957627b2ec931484074aa 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, 10 Jul 2023 03:31:11 -0400 Subject: [PATCH 36/42] Update laspistol.dm --- .../modules/projectiles/guns/energy/tier1/laspistol.dm | 2 +- 1 file changed, 1 insertion(+), 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 1679f022e82..aafb4f6cda7 100644 --- a/mods/persistence/modules/projectiles/guns/energy/tier1/laspistol.dm +++ b/mods/persistence/modules/projectiles/guns/energy/tier1/laspistol.dm @@ -1,6 +1,6 @@ /obj/item/gun/energy/laser/pistol/simple name = "Laser 'Settler' EG" - desc = "Energy gun used by modern spacers. Compact, but suffers from low charge capacity because of this. Fires Alpha-type laser beams." + desc = "Laser pistol used by modern spacers. Compact, but suffers from low charge capacity because of this. Fires Alpha-type laser beams." icon = 'mods/persistence/icons/obj/guns/tier1/laspistol.dmi' slot_flags = SLOT_LOWER_BODY w_class = ITEM_SIZE_NORMAL From 561e3dcfaffaac0d3a428cf45ecf96c120aaddb6 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, 10 Jul 2023 03:31:21 -0400 Subject: [PATCH 37/42] Update lasrifle.dm --- .../modules/projectiles/guns/energy/tier0/lasrifle.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm b/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm index ba0c2aeda1c..b21a7d41bc6 100644 --- a/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm +++ b/mods/persistence/modules/projectiles/guns/energy/tier0/lasrifle.dm @@ -1,6 +1,6 @@ /obj/item/gun/energy/laser/rifle/handmade name = "Laser 'Tagger' EG" - desc = "Energy rifle of dubious origin. Shoddy craftsmanship results in low charge capacity and weak output. Fires Alpha-type laser beams." + desc = "Laser rifle of dubious origin. Shoddy craftsmanship results in low charge capacity and weak output. Fires Alpha-type laser beams." icon = 'mods/persistence/icons/obj/guns/tier0/lasrifle.dmi' slot_flags = SLOT_LOWER_BODY|SLOT_BACK w_class = ITEM_SIZE_LARGE From 2d195ef226aaa56657ba1ee9412d25f579d8cbc8 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, 17 Jul 2023 20:49:53 -0400 Subject: [PATCH 38/42] replace origin tech overrides to research exclusions --- .../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 37f18ab6b8b..4c8af1f4537 100644 --- a/mods/persistence/modules/projectiles/overrides.dm +++ b/mods/persistence/modules/projectiles/overrides.dm @@ -1,38 +1,38 @@ /obj/item/gun/launcher/syringe/rapid - origin_tech = "{'wormholes':1337}" + research_excluded = TRUE /obj/item/gun/energy/temperature - origin_tech = "{'wormholes':1337}" + research_excluded = TRUE /obj/item/grenade/anti_photon - origin_tech = "{'wormholes':1337}" + research_excluded = TRUE /obj/item/gun/energy/confuseray - origin_tech = "{'wormholes':1337}" + research_excluded = TRUE /obj/item/gun/energy/gun/nuclear - origin_tech = "{'wormholes':1337}" + research_excluded = TRUE /obj/item/gun/energy/lasercannon - origin_tech = "{'wormholes':1337}" + research_excluded = TRUE /obj/item/gun/energy/xray - origin_tech = "{'wormholes':1337}" + research_excluded = TRUE /obj/item/gun/launcher/grenade - origin_tech = "{'wormholes':1337}" + research_excluded = TRUE /obj/item/gun/magnetic/railgun/flechette - origin_tech = "{'wormholes':1337}" + research_excluded = TRUE /obj/item/gun/energy/toxgun - origin_tech = "{'wormholes':1337}" + research_excluded = TRUE /obj/item/gun/energy/decloner - origin_tech = "{'wormholes':1337}" + research_excluded = TRUE /obj/item/gun/projectile/automatic/smg - origin_tech = "{'wormholes':1337}" + research_excluded = TRUE /obj/item/gun/projectile/automatic/assault_rifle - origin_tech = "{'wormholes':1337}" + research_excluded = TRUE From ba2f0d58b07881b8be72c89433e85f5d38597c96 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, 17 Jul 2023 20:57:29 -0400 Subject: [PATCH 39/42] delete unnecessary file --- .../modules/fabrication/fabricator_protolathe.dm | 14 -------------- 1 file changed, 14 deletions(-) delete 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 deleted file mode 100644 index 605b8501ec4..00000000000 --- a/mods/persistence/modules/fabrication/fabricator_protolathe.dm +++ /dev/null @@ -1,14 +0,0 @@ -/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/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, - /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 - ) \ No newline at end of file From 1b119871490ae65a4d70713a9c470bd5fd44025c 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, 17 Jul 2023 20:59:39 -0400 Subject: [PATCH 40/42] Update _persistence.dme --- mods/persistence/_persistence.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme index 1be48310bc6..b1e0bd19291 100644 --- a/mods/persistence/_persistence.dme +++ b/mods/persistence/_persistence.dme @@ -132,7 +132,6 @@ #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_weapons.dm" #include "modules\hydroponics\grown.dm" From e9e60c7d2459eae706a2c10bda284bc0ca4e573f 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, 17 Jul 2023 21:01:18 -0400 Subject: [PATCH 41/42] remove anti-photon grenade from overrides --- mods/persistence/modules/projectiles/overrides.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/mods/persistence/modules/projectiles/overrides.dm b/mods/persistence/modules/projectiles/overrides.dm index 4c8af1f4537..4cb07ea2853 100644 --- a/mods/persistence/modules/projectiles/overrides.dm +++ b/mods/persistence/modules/projectiles/overrides.dm @@ -4,9 +4,6 @@ /obj/item/gun/energy/temperature research_excluded = TRUE -/obj/item/grenade/anti_photon - research_excluded = TRUE - /obj/item/gun/energy/confuseray research_excluded = TRUE From 6673b5d696a31cf8c448e8fb3fde581e117cc8f9 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, 17 Jul 2023 21:07:51 -0400 Subject: [PATCH 42/42] fix overrides from using item paths to recipe datums --- .../modules/projectiles/overrides.dm | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mods/persistence/modules/projectiles/overrides.dm b/mods/persistence/modules/projectiles/overrides.dm index 4cb07ea2853..03882b5ed51 100644 --- a/mods/persistence/modules/projectiles/overrides.dm +++ b/mods/persistence/modules/projectiles/overrides.dm @@ -1,35 +1,35 @@ -/obj/item/gun/launcher/syringe/rapid +/datum/fabricator_recipe/protolathe/weapon/rapidsyringe research_excluded = TRUE -/obj/item/gun/energy/temperature +/datum/fabricator_recipe/protolathe/weapon/temp_gun research_excluded = TRUE -/obj/item/gun/energy/confuseray +/datum/fabricator_recipe/protolathe/weapon/confuseray research_excluded = TRUE -/obj/item/gun/energy/gun/nuclear +/datum/fabricator_recipe/protolathe/weapon/nuclear_gun research_excluded = TRUE -/obj/item/gun/energy/lasercannon +/datum/fabricator_recipe/protolathe/weapon/lasercannon research_excluded = TRUE -/obj/item/gun/energy/xray +/datum/fabricator_recipe/protolathe/weapon/xrayrifle research_excluded = TRUE -/obj/item/gun/launcher/grenade +/datum/fabricator_recipe/protolathe/weapon/grenadelauncher research_excluded = TRUE -/obj/item/gun/magnetic/railgun/flechette +/datum/fabricator_recipe/protolathe/weapon/flechette research_excluded = TRUE -/obj/item/gun/energy/toxgun +/datum/fabricator_recipe/protolathe/weapon/radpistol research_excluded = TRUE -/obj/item/gun/energy/decloner +/datum/fabricator_recipe/protolathe/weapon/decloner research_excluded = TRUE -/obj/item/gun/projectile/automatic/smg +/datum/fabricator_recipe/protolathe/weapon/wt550 research_excluded = TRUE -/obj/item/gun/projectile/automatic/assault_rifle +/datum/fabricator_recipe/protolathe/weapon/bullpup research_excluded = TRUE