cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

The Ballistics Expansion (#15675)

Browse Source 
* Gee I sure hope this PR never stacks an obnoxious number of cornflakes that force me to make a new PR

* forgot to adjust metalshock description

* i forgot to change magtype of the boarder!!

* USE your sprites damnit

* redundancy my beloved

* mild number tweaks

* first patch

* second patch

* small sprite changes

* third patch

* bullet speed patch

* gives ap to wt incend since it doesnt inherit it unlike the rubber

* makes trac less bad

* minor description oversights
This commit is contained in:
Skrem_7
2022-10-01 06:37:37 -05:00
committed by GitHub
parent 3e05278863
commit 05f6818e94
51 changed files with 766 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/cargo/exports/weapons.dm
View File

@@ -38,7 +38,7 @@
/datum/export/weapon/wt550
cost = 300
unit_name = "WT-550 automatic rifle"
unit_name = "WT-550 automatic carbine"
export_types = list(/obj/item/gun/ballistic/automatic/wt550)
/datum/export/weapon/shotgun

36
code/modules/cargo/packs.dm
View File

@@ -260,7 +260,7 @@
/datum/supply_pack/security/ammo
name = "Ammo Crate"
desc = "Contains two 20-round magazines for the WT-550 Auto Rifle, three boxes of buckshot ammo, three boxes of rubber ammo, and special .38 speedloaders. Requires Security access to open."
desc = "Contains two 22-round magazines for the WT-550 Auto Carbine, three boxes of buckshot ammo, three boxes of rubber ammo, and special .38 speedloaders. Requires Security access to open."
cost = 2500
access_view = ACCESS_ARMORY
contains = list(/obj/item/ammo_box/magazine/wt550m9,
@@ -569,13 +569,19 @@
/datum/supply_pack/security/armory/trackingimp
name = "Tracking Implants Crate"
desc = "Contains four tracking implants and three speedloaders for the Caldwell Tracking Revolver. Requires Armory access to open."
desc = "Contains a box with four tracking implants. Requires Armory access to open."
cost = 2000
contains = list(/obj/item/storage/box/trackimp,
/obj/item/ammo_box/tra32,
contains = list(/obj/item/storage/box/trackimp)
crate_name = "tracking implant crate"
/datum/supply_pack/security/armory/tracrevolver
name = "TRAC Revolver Crate"
desc = "Contains one Caldwell Tracking Revolver and two speed loaders for it. Requires Armory access to open."
cost = 4000
contains = list(/obj/item/gun/ballistic/revolver/tracking,
/obj/item/ammo_box/tra32,
/obj/item/ammo_box/tra32)
crate_name = "tracking implant crate"
crate_name = "TRAC revolver crate"
/datum/supply_pack/security/armory/laserarmor
name = "Reflective Jacket Crate"
@@ -678,23 +684,23 @@
crate_name = "swat crate"
/datum/supply_pack/security/armory/wt550_single
name = "Surplus Security Autorifle Single-Pack"
desc = "Contains one high-powered, semiautomatic rifle chambered in 4.6x30mm rounds. Requires Armory access to open."
name = "Surplus Security Autocarbine Single-Pack"
desc = "Contains one high-powered, semiautomatic carbine chambered in 4.6x30mm rounds. Requires Armory access to open."
cost = 2000
contains = list(/obj/item/gun/ballistic/automatic/wt550)
small_item = TRUE
/datum/supply_pack/security/armory/wt550
name = "Surplus Security Autorifle Crate"
desc = "Contains two high-powered, semiautomatic rifles chambered in 4.6x30mm rounds. Requires Armory access to open."
name = "Surplus Security Autocarbine Crate"
desc = "Contains two high-powered, semiautomatic carbines chambered in 4.6x30mm rounds. Requires Armory access to open."
cost = 3500
contains = list(/obj/item/gun/ballistic/automatic/wt550,
/obj/item/gun/ballistic/automatic/wt550)
crate_name = "auto rifle crate"
/datum/supply_pack/security/armory/wt550ammo
name = "Surplus Security Autorifle Ammo Crate"
desc = "Contains four 22-round magazines for the surplus security autorifle. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
name = "Surplus Security Autocarbine Ammo Crate"
desc = "Contains four 22-round magazines for the surplus security autocarbine. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
cost = 3000
contains = list(/obj/item/ammo_box/magazine/wt550m9,
/obj/item/ammo_box/magazine/wt550m9,
@@ -702,8 +708,8 @@
/obj/item/ammo_box/magazine/wt550m9)
/datum/supply_pack/security/armory/wt550ammo_rubber
name = "Surplus Security Autorifle Ammo Crate"
desc = "Contains four 22-round less-than-lethal magazines for the surplus security autorifle. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
name = "Surplus Security Autocarbine Ammo Crate"
desc = "Contains four 22-round less-than-lethal magazines for the surplus security autocarbine. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
cost = 2500
contains = list(/obj/item/ammo_box/magazine/wt550m9/wtr,
/obj/item/ammo_box/magazine/wt550m9/wtr,
@@ -711,8 +717,8 @@
/obj/item/ammo_box/magazine/wt550m9/wtr)
/datum/supply_pack/security/armory/wt550ammo_single
name = "Surplus Security Autorifle Ammo Crate Single-Pack"
desc = "Contains a 22-round magazine for the surplus security autorifle. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
name = "Surplus Security Autocarbine Ammo Crate Single-Pack"
desc = "Contains a 22-round magazine for the surplus security autocarbine. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
cost = 750 //one of the few single-pack items that who's price per unit is the exact same as the bulk
contains = list(/obj/item/ammo_box/magazine/wt550m9)
small_item = TRUE