From a8736fff066b81714ee5f2204a4fb3d53f47346e Mon Sep 17 00:00:00 2001 From: Gristlebee <56049844+Gristlebee@users.noreply.github.com> Date: Fri, 12 Jul 2024 16:23:24 -0700 Subject: [PATCH] 357 Revolver Guncase uses the correct subtype (#3206) ## About The Pull Request Fixes #3200 The guncase had the wrong subtype. ## Why It's Good For The Game I DEMAND "Apogee-Dev" BE DEMOTED- ![image](https://github.com/user-attachments/assets/8f6881f0-3f84-4af1-8ce4-8d4977e87f5a) ## Changelog :cl: fix: 357 guncase spawns with the correct revolver /:cl: --- code/game/objects/items/storage/guncases.dm | 2 +- code/modules/projectiles/guns/ballistic/revolver.dm | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/guncases.dm b/code/game/objects/items/storage/guncases.dm index d4dd2896ace9..b70de7a01444 100644 --- a/code/game/objects/items/storage/guncases.dm +++ b/code/game/objects/items/storage/guncases.dm @@ -153,7 +153,7 @@ /obj/item/storage/pistolcase/a357 /obj/item/storage/pistolcase/a357/PopulateContents() - new /obj/item/gun/ballistic/revolver/no_mag(src) + new /obj/item/gun/ballistic/revolver/syndicate/no_mag(src) new /obj/item/ammo_box/a357/empty(src) new /obj/item/ammo_box/a357/empty(src) diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 416ab364ea78..545cbf8bf117 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -557,6 +557,9 @@ EMPTY_GUN_HELPER(revolver/detective) /obj/item/gun/ballistic/revolver/detective/no_mag spawnwithmagazine = FALSE +/obj/item/gun/ballistic/revolver/syndicate/no_mag + spawnwithmagazine = FALSE + /obj/item/gun/ballistic/revolver/no_mag spawnwithmagazine = FALSE