mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 08:08:49 +01:00
MrGloopyandGitHub
50222a9465
## About The Pull Request This PR adds two new revolvers to cargo orders. Both are available as a goodie. The security variant fires 9mm Murphy rounds and is orderable via departmental order as well. The Civillian version fires .38 but is slightly innacurate due to poor quality. ## Why It's Good For The Game ### MORE DAKKA ## Proof Of Testing <img width="858" height="762" alt="image" src="https://github.com/user-attachments/assets/5292f6bf-b536-4b69-9588-978d21f4d761" /> <img width="408" height="151" alt="image" src="https://github.com/user-attachments/assets/93f6a7c2-2ed3-46f0-866e-2bcddca42718" /> <img width="689" height="595" alt="image" src="https://github.com/user-attachments/assets/417fc0ac-3634-43d3-b6dd-ade273682fe2" /> <img width="885" height="677" alt="image" src="https://github.com/user-attachments/assets/a6461a4a-8b44-4a67-b92b-9f95841eec5a" /> <img width="1592" height="1069" alt="image" src="https://github.com/user-attachments/assets/7de179ff-6ac8-48f5-885f-dbacdd7881a3" /> ### NEW SPRITES BELOW <img width="197" height="124" alt="image" src="https://github.com/user-attachments/assets/24b93d43-fae1-455b-9d93-e81f84536585" /> <details> <summary>Screenshots/Videos</summary> </details> ## Changelog 🆑 add: 'Protector' revolver. Fires 9mm 'Murphy' with a 5 shot capacity. add: 'Defender' revolver. The 'Defender' is a cheaply manufactured knockoff of the 'Protector'. It fires .38 rounds while being very cheap, at a cost of doing 90% damage and a small accuracy penalty. add: New revolvers to cargo. The 'Protector' is available in a 3 pack via departmental security order as well. Both are available as single pack goodies. image: Sprites for the new revolvers by Niim. /🆑
59 lines
2.7 KiB
Plaintext
59 lines
2.7 KiB
Plaintext
//Cargo
|
|
/datum/export/weapon/sec_glock
|
|
export_types = list(/obj/item/gun/ballistic/automatic/pistol/sec_glock)
|
|
cost = CARGO_CRATE_VALUE * 1.25
|
|
unit_name = "'Murphy' Service Pistol"
|
|
|
|
/datum/supply_pack/security/armory/sec_glock
|
|
name = "'Murphy' Service Pistol Crate"
|
|
desc = "Contains three 'Murphy' service pistols pre-loaded with lethal rounds. Additional ammo sold seperately. Nanotrasen reminds you that the other weapons are for friends, and not for going guns akimbo."
|
|
cost = CARGO_CRATE_VALUE * 6
|
|
contains = list(/obj/item/gun/ballistic/automatic/pistol/sec_glock = 3)
|
|
crate_name = "'Murphy' service pistol crate"
|
|
access_view = ACCESS_WEAPONS
|
|
|
|
/datum/supply_pack/security/armory/sec_glock_ammo
|
|
name = "'Murphy' Service Pistol Ammo Crate"
|
|
desc = "Contains 4 magazines with lethal rounds for the 'Murphy' service pistol."
|
|
cost = CARGO_CRATE_VALUE * 3
|
|
contains = list(/obj/item/ammo_box/magazine/security = 4)
|
|
crate_name = "'Murphy' service pistol ammo crate"
|
|
access_view = ACCESS_WEAPONS
|
|
|
|
/datum/supply_pack/security/armory/alert_level_firing_pin
|
|
name = "Alert Level Firing Pin Crate"
|
|
desc = "Contains four special firing pins that only allow firing on code blue or higher."
|
|
cost = CARGO_CRATE_VALUE * 4
|
|
contains = list(/obj/item/firing_pin/alert_level = 4)
|
|
crate_name = "alert level firing pin crate"
|
|
access_view = ACCESS_WEAPONS
|
|
|
|
/datum/supply_pack/goody/murphy_single
|
|
name = "'Murphy' Service Pistol Single-Pack"
|
|
desc = "A rugged, law-enforcement-grade service pistol, once famously sold for just a dollar. Comes as a single-pack with one 'Murphy' pistol ready for action."
|
|
cost = PAYCHECK_COMMAND * 5
|
|
contains = list(/obj/item/gun/ballistic/automatic/pistol/sec_glock = 1)
|
|
access_view = ACCESS_WEAPONS
|
|
|
|
/datum/supply_pack/goody/murphy_ammo
|
|
name = "'Murphy' Service Pistol Magazine Single-Pack"
|
|
desc = "Full magazine with an extra-robust ejection spring. Fits into the Murphy Service Pistol."
|
|
cost = PAYCHECK_COMMAND * 2
|
|
contains = list(/obj/item/ammo_box/magazine/security = 1)
|
|
access_view = ACCESS_WEAPONS
|
|
|
|
/datum/supply_pack/security/armory/protector_revolver
|
|
name = "'Protector' Service Revolver Crate"
|
|
desc = "Contains three 'Protector' service revolvers pre-loaded with lethal rounds. Additional ammo sold seperately."
|
|
cost = CARGO_CRATE_VALUE * 4
|
|
contains = list(/obj/item/gun/ballistic/revolver/protector_revolver = 3)
|
|
crate_name = "'Protector' service revolver crate"
|
|
access_view = ACCESS_WEAPONS
|
|
|
|
/datum/supply_pack/goody/protector_revolver_single
|
|
name = "'Protector' Service Revolver Single-Pack"
|
|
desc = "A single 'Protector' revolver. Uses 'Murphy' ammo, sold separately"
|
|
cost = PAYCHECK_COMMAND * 6
|
|
contains = list(/obj/item/gun/ballistic/revolver/protector_revolver = 1)
|
|
access_view = ACCESS_WEAPONS
|