mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-21 07:03:05 +00:00
a3ef71fe18
## About The Pull Request Thankfully not as many bugs or oversights as I previously thought, but enough to hammer them out all at once. This fixes some incorrect or missing item descriptions, a few research item names, and a very important bugfix with the weapon conversion kits. - Updates description for Renoster shotgun, and Rengo rifle, as they had the incorrect magazine size listed. - Adds descriptions for Carbine and Battle Rifle conversion kits. - Makes the Carbine and Battle Rifle conversion kits not give a full free mag on crafting. - Makes the Carbine, Battle Rifle, and Shaytan SMG conversion crafts require the gun not have a magazine inserted, and the bolt be open to craft. - Fixes lathe description and name for Stardust / Advanced Anti Riot shells, homogenizes name as "Less-Lethal" - Fixes description on Stardust ammo box. - Pedantic nitpick renaming WT-550 rubber mags from "Less-Than-Lethal" to "Less-Lethal", as that was the only use of the term "Less-Than-Lethal" with any firearm. - Updates Shaytan gun description to not be a copy of the conversion kit description. (provided by @Offwrldr / Bangle) - Updates Shaytan conversion kit name and description in the sec lathe. - Updates all shotgun ammo boxes to show the proper max ammo count (which is now 7) - Reduces cost of Honkshot from 100cr to 25cr (as it now is properly overridden) - Standardizes all shotgun ammo boxes to hold 7 rounds (dropping scatterlaser, hunter, flechette, dragon's breath, hornet's nest, stardust, pulse slug, and scatter ion from 15 rounds per box, and honkshot from 35 rounds per box). ## Why It's Good For The Game As for the descriptions and names, fixing stuff that is blatantly incorrect or misleading is good. As for the conversion crafts, giving people free ammo and magazines is anywhere from an unfortunate oversight, to outright boo-boo-busted. Consistency for ammo boxes is also good (alongside accurate descriptions), and I checked with a maintainer in the discord before updating ammo box values. ## Proof Of Testing I'm not taking screenshots of descriptions in the lathe, or of items. If it complies, they're accurate. I do have a video showing the crafts requiring the guns to have no magazine, and be open bolt though. https://github.com/user-attachments/assets/9c8313c4-274d-4e7d-9211-7938f595c42f ## Changelog 🆑 Impish_Delights, Bangle fix: Romulus Carbine, and Romulus Battle-Rifle crafts no longer give free loaded magazines. balance: All shotgun ammo boxes now hold 7 rounds. Honkshot is now 25cr from cargo, down from 100cr. code: Romulus Carbine, Romulus Battle-Rifle, and Romulus Shaytan kit now require gun to be empty, and locked open to craft. spellcheck: Fixes description for Rengo rifle, Renoster shotgun, Stardust/AAR cartridge box, and Romulus Carbine and Battle-Rifle conversion kits. spellcheck: Homogonizes description for Stardust/AAR ammo, and Beanbag slug ammo as "Less-Lethal" spellcheck: Changes WT-550 rubber mag to be "Less-Lethal" instead of "Less-Than_Lethal" spellcheck: Updates Shaytan SMG description, and conversion kit name and description in the security lathe. spellcheck: Updates all shotgun ammo boxes to be accurate. /🆑 --------- Co-authored-by: Bangle <140950607+Offwrldr@users.noreply.github.com>
87 lines
3.5 KiB
Plaintext
87 lines
3.5 KiB
Plaintext
/datum/supply_pack/security/armory/wt551
|
|
name = "WT-551 Autorifle Crate"
|
|
desc = "Contains a pair of WT-551 Autorifles pre-loaded with less-lethal rubber-tipped rounds. Additional ammo sold seperately. Backwards-compatible with WT-550 magazines. NanoTrasen reminds you that the other weapon is for a friend, and not for going guns akimbo."
|
|
cost = CARGO_CRATE_VALUE * 8
|
|
contains = list(/obj/item/gun/ballistic/automatic/wt550/security/rubber = 2)
|
|
crate_name = "wt-550 autorifle crate"
|
|
|
|
/datum/supply_pack/security/armory/wt550_ammo_rubber
|
|
name = "WT-550/WT-551 Autorifle Ammo Crate (Rubber-Tipped)"
|
|
desc = "Contains 4 magazines with less-lethal rubber-tipped rounds for the WT-551."
|
|
cost = CARGO_CRATE_VALUE * 4
|
|
contains = list(/obj/item/ammo_box/magazine/wt550m9/rubber = 4)
|
|
crate_name = "wt-550 magazine crate (rubber-tipped)"
|
|
|
|
/datum/supply_pack/security/armory/wt550_ammo_flat
|
|
name = "WT-550/WT-551 Autorifle Ammo Crate (Flat-Tipped)"
|
|
desc = "Contains 3 magazines with lethal flat-tipped rounds for the WT-551."
|
|
cost = CARGO_CRATE_VALUE * 5
|
|
contains = list(/obj/item/ammo_box/magazine/wt550m9/flathead = 4)
|
|
crate_name = "wt-550 magazine crate (flat-tipped)"
|
|
|
|
/datum/supply_pack/security/armory/wt550_ammo_regular
|
|
name = "WT-550/WT-551 Autorifle Ammo Crate (Regular)"
|
|
desc = "Contains 3 magazines with lethal regular rounds for the WT-551."
|
|
cost = CARGO_CRATE_VALUE * 7
|
|
contains = list(/obj/item/ammo_box/magazine/wt550m9 = 4)
|
|
crate_name = "wt-550 magazine crate (regular)"
|
|
|
|
/datum/supply_pack/security/ammo
|
|
contains = list(/obj/item/ammo_box/advanced/s12gauge/bean = 3,
|
|
/obj/item/ammo_box/advanced/s12gauge/rubber = 3,
|
|
/obj/item/ammo_box/c38/trac,
|
|
/obj/item/ammo_box/c38/hotshot,
|
|
/obj/item/ammo_box/c38/iceblox,
|
|
)
|
|
special = FALSE
|
|
//This makes the Security ammo crate use the cool advanced ammo boxes instead of the old ones
|
|
|
|
|
|
/datum/supply_pack/security/secmed_technician
|
|
name = "Security Medic Kit Crate - Technician"
|
|
crate_name = "security medic crate"
|
|
desc = "Contains a medical technician kit."
|
|
access = ACCESS_SECURITY
|
|
cost = CARGO_CRATE_VALUE * 7.125
|
|
contains = list(
|
|
/obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked,
|
|
)
|
|
|
|
/datum/supply_pack/security/secmed_surgical
|
|
name = "Security Medic Kit Crate - Surgical"
|
|
crate_name = "security medic crate"
|
|
desc = "Contains a first responder surgical kit."
|
|
access = ACCESS_SECURITY
|
|
cost = CARGO_CRATE_VALUE * 3.9
|
|
contains = list(
|
|
/obj/item/storage/backpack/duffelbag/deforest_surgical/stocked,
|
|
)
|
|
|
|
/datum/supply_pack/security/secmed_medical
|
|
name = "Security Medic Kit Crate - Medical"
|
|
crate_name = "security medic crate"
|
|
desc = "Contains a large satchel medical kit."
|
|
access = ACCESS_SECURITY
|
|
cost = CARGO_CRATE_VALUE * 7.125
|
|
contains = list(
|
|
/obj/item/storage/backpack/duffelbag/deforest_medkit/stocked,
|
|
)
|
|
|
|
/datum/supply_pack/security/plasma_marksman
|
|
name = "Gwiazda Plasma Sharpshooter Single-Pack"
|
|
crate_name = "Gwiadza Plasma Sharpshooter Crate"
|
|
desc = "Contains a Gwiazda Plasma Sharpshooter and one plasma battery for it."
|
|
contains = list(/obj/item/gun/ballistic/automatic/pistol/plasma_marksman = 1,
|
|
/obj/item/ammo_box/magazine/recharge/plasma_battery = 1)
|
|
cost = CARGO_CRATE_VALUE * 10
|
|
access = ACCESS_SECURITY
|
|
|
|
/datum/supply_pack/security/miecz
|
|
name = "Miecz Submachine Gun Single-Pack"
|
|
crate_name = "Miecz submachinegun crate"
|
|
desc = "Contains a Miecz submachinegun and a spare magazine for it."
|
|
contains = list(/obj/item/gun/ballistic/automatic/miecz = 1,
|
|
/obj/item/ammo_box/magazine/miecz = 1)
|
|
cost = CARGO_CRATE_VALUE * 10
|
|
access = ACCESS_SECURITY
|