From fde4e32f28dfe00d987245cb473944081fe5db41 Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Wed, 10 Jan 2024 19:59:57 -0500 Subject: [PATCH 1/3] Pocket pistol fix --- .../projectiles/guns/projectile/tier1/pistol_pocket.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_pocket.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_pocket.dm index 210832234cf..70f98d62a34 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_pocket.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_pocket.dm @@ -18,5 +18,5 @@ /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE ) -/obj/item/gun/projectile/pistol_pocket/simple/empty - starts_loaded = FALSE \ No newline at end of file +/obj/item/gun/projectile/pistol/pistol_pocket/simple/empty + starts_loaded = FALSE From 4c4f5ef8add968e221384be210127c40c1e92432 Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Wed, 10 Jan 2024 20:01:47 -0500 Subject: [PATCH 2/3] Update pistol_pocket.dm --- .../projectiles/guns/projectile/tier2/pistol_pocket.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier2/pistol_pocket.dm b/mods/persistence/modules/projectiles/guns/projectile/tier2/pistol_pocket.dm index 9e37cc9c33b..610b6aa8cd1 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier2/pistol_pocket.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier2/pistol_pocket.dm @@ -23,5 +23,5 @@ list(mode_name="3-round bursts", burst=3, fire_delay=2, one_hand_penalty=1, burst_accuracy=list(1,0,-1), dispersion=list(0.0, 1.6, 2.4, 2.4)), ) -/obj/item/gun/projectile/pistol_pocket/advanced/empty - starts_loaded = FALSE \ No newline at end of file +/obj/item/gun/projectile/pistol/pistol_pocket/advanced/empty + starts_loaded = FALSE From 3ec2bff41106bc12935f5279bb3d9e0f09748c14 Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Wed, 10 Jan 2024 20:05:54 -0500 Subject: [PATCH 3/3] Update designs_weapons.dm --- .../fabrication/designs/protolathe/designs_weapons.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm b/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm index c15e907450e..55efcec0414 100644 --- a/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm +++ b/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm @@ -17,7 +17,7 @@ path = /obj/item/gun/projectile/bolt_action/simple/empty /datum/fabricator_recipe/protolathe/weapon/tier1/pistol_pocket - path = /obj/item/gun/projectile/pistol_pocket/simple/empty + path = /obj/item/gun/projectile/pistol/pistol_pocket/simple/empty /datum/fabricator_recipe/protolathe/weapon/tier1/pistol path = /obj/item/gun/projectile/pistol/simple/empty @@ -53,7 +53,7 @@ path = /obj/item/gun/projectile/bolt_action/advanced/empty /datum/fabricator_recipe/protolathe/weapon/tier2/pistol_pocket - path = /obj/item/gun/projectile/pistol_pocket/advanced/empty + path = /obj/item/gun/projectile/pistol/pistol_pocket/advanced/empty /datum/fabricator_recipe/protolathe/weapon/tier2/pistol path = /obj/item/gun/projectile/pistol/advanced/empty @@ -65,4 +65,4 @@ path = /obj/item/gun/projectile/automatic/smg/advanced/empty /datum/fabricator_recipe/protolathe/weapon/tier2/shotgun_pump - path = /obj/item/gun/projectile/shotgun/pump/advanced/empty \ No newline at end of file + path = /obj/item/gun/projectile/shotgun/pump/advanced/empty