Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Gives the Revolvers on the Nuke Ops uplink Syndicate Firing Pins #378

Merged
merged 1 commit into from
Nov 1, 2023
Merged

[MIRROR] Gives the Revolvers on the Nuke Ops uplink Syndicate Firing Pins #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion code/game/objects/items/storage/holsters.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,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)



2 changes: 1 addition & 1 deletion code/game/objects/items/storage/toolbox.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,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
Expand Down
6 changes: 6 additions & 0 deletions code/modules/projectiles/guns/ballistic/revolver.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
Loading