From 3e74d1ee8ea216a73ec8eea551bc4d01078b4e27 Mon Sep 17 00:00:00 2001 From: starrm4nn <139372157+starrm4nn@users.noreply.github.com> Date: Tue, 31 Oct 2023 15:07:36 +0000 Subject: [PATCH] Gives the Revolvers on the Nuke Ops uplink Syndicate Firing Pins (#79327) ## About The Pull Request gives revolvers on the nukie uplink syndie firing pins ## Why It's Good For The Game Every other firearm on the nukie uplink has a syndie firing pin. ## Changelog :cl: fix: The Syndicate Revolver now has a Syndicate Firing Pin on the Nuke Ops uplink. /:cl: --- code/game/objects/items/storage/holsters.dm | 4 +++- code/game/objects/items/storage/toolbox.dm | 2 +- code/modules/projectiles/guns/ballistic/revolver.dm | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm index cb722469a2c..400c949a993 100644 --- a/code/game/objects/items/storage/holsters.dm +++ b/code/game/objects/items/storage/holsters.dm @@ -195,7 +195,9 @@ /obj/item/storage/belt/holster/nukie/cowboy/full/PopulateContents() generate_items_inside(list( - /obj/item/gun/ballistic/revolver/syndicate/cowboy = 1, + /obj/item/gun/ballistic/revolver/syndicate/cowboy/nuclear = 1, /obj/item/ammo_box/a357 = 2, ), src) + + diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 3ae44029d15..42f5e08f479 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -374,7 +374,7 @@ /obj/item/storage/toolbox/guncase/revolver name = "revolver gun case" - weapon_to_spawn = /obj/item/gun/ballistic/revolver/syndicate + weapon_to_spawn = /obj/item/gun/ballistic/revolver/syndicate/nuclear extra_to_spawn = /obj/item/ammo_box/a357 /obj/item/storage/toolbox/guncase/sword_and_board diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index f87f473ae45..2b943a5f6db 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -139,11 +139,17 @@ desc = "A modernized 7 round revolver manufactured by Waffle Co. Uses .357 ammo." icon_state = "revolversyndie" +/obj/item/gun/ballistic/revolver/syndicate/nuclear + pin = /obj/item/firing_pin/implant/pindicate + /obj/item/gun/ballistic/revolver/syndicate/cowboy desc = "A classic revolver, refurbished for modern use. Uses .357 ammo." //There's already a cowboy sprite in there! icon_state = "lucky" +/obj/item/gun/ballistic/revolver/syndicate/cowboy/nuclear + pin = /obj/item/firing_pin/implant/pindicate + /obj/item/gun/ballistic/revolver/mateba name = "\improper Unica 6 auto-revolver" desc = "A retro high-powered autorevolver typically used by officers of the New Russia military. Uses .357 ammo."