cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ammo Boxes

Browse Source
This commit is contained in:
Casey
2022-03-03 16:22:34 -05:00
committed by CHOMPStation2
parent c3225b4c26
commit 80f5298a18
38 changed files with 1254 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/datums/autolathe/arms.dm
View File

@@ -411,12 +411,6 @@
category = list("Arms and Ammunition")
hidden = 1
/datum/category_item/autolathe/arms/pistol_clip_10mm
name = "ammo clip (10mm)"
path =/obj/item/ammo_magazine/clip/c10mm
category = list("Arms and Ammunition")
hidden = 1
/datum/category_item/autolathe/arms/pistol_clip_50
name = "ammo clip (.44)"
path =/obj/item/ammo_magazine/clip/c50

12
code/datums/supplypacks/munitions.dm
View File

@@ -38,7 +38,7 @@
/obj/item/weapon/gun/projectile/sec/flash,
/obj/item/ammo_magazine/m45/flash,
/obj/item/weapon/gun/projectile/shotgun/doublebarrel/flare,
/obj/item/weapon/storage/box/flashshells
/obj/item/ammo_magazine/ammo_box/b12g/flash
)
cost = 25
containertype = /obj/structure/closet/crate/secure/gear
@@ -66,8 +66,8 @@
/datum/supply_pack/munitions/shotgun
name = "Weapons - Shotgun crate"
contains = list(
/obj/item/weapon/storage/box/shotgunammo,
/obj/item/weapon/storage/box/shotgunshells,
/obj/item/ammo_magazine/ammo_box/b12g,
/obj/item/ammo_magazine/ammo_box/b12g/pellet,
/obj/item/weapon/gun/projectile/shotgun/pump/combat = 2
)
cost = 50
@@ -198,8 +198,8 @@
/datum/supply_pack/munitions/shotgunammo
name = "Ammunition - Shotgun shells"
contains = list(
/obj/item/weapon/storage/box/shotgunammo = 2,
/obj/item/weapon/storage/box/shotgunshells = 2
/obj/item/ammo_magazine/ammo_box/b12g = 2,
/obj/item/ammo_magazine/ammo_box/b12g/pellet = 2
)
cost = 25
containertype = /obj/structure/closet/crate/secure/weapon
@@ -208,7 +208,7 @@
/datum/supply_pack/munitions/beanbagammo
name = "Ammunition - Beanbag shells"
contains = list(/obj/item/weapon/storage/box/beanbags = 3)
contains = list(/obj/item/ammo_magazine/ammo_box/b12g/beanbag = 3)
cost = 25
containertype = /obj/structure/closet/crate
containername = "Ballistic ammunition crate"

2
code/datums/supplypacks/security.dm
View File

@@ -256,7 +256,7 @@
/obj/item/weapon/shield/riot = 3,
/obj/item/weapon/handcuffs = 3,
/obj/item/weapon/storage/box/flashbangs,
/obj/item/weapon/storage/box/beanbags,
/obj/item/ammo_magazine/ammo_box/b12g/beanbag,
/obj/item/weapon/storage/box/handcuffs
)
cost = 40

14
code/datums/uplink/ammunition.dm
View File

@@ -63,11 +63,11 @@
/datum/uplink_item/item/ammo/sniperammo
name = "Anti-Materiel Rifle ammo box (14.5mm)"
path = /obj/item/weapon/storage/box/sniperammo
path = /obj/item/ammo_magazine/ammo_box/b145
/datum/uplink_item/item/ammo/sniperammo_highvel
name = "Anti-Materiel Rifle ammo box (14.5mm sabot)"
path = /obj/item/weapon/storage/box/sniperammo/highvel
path = /obj/item/ammo_magazine/ammo_box/b145/highvel
/datum/uplink_item/item/ammo/c545
name = "Rifle Magazine (5.45mm)"
@@ -107,25 +107,25 @@
/datum/uplink_item/item/ammo/g12
name = "12g Shotgun Ammo Box (Slug)"
path = /obj/item/weapon/storage/box/shotgunammo
path = /obj/item/ammo_magazine/ammo_box/b12g
/datum/uplink_item/item/ammo/g12/beanbag
name = "12g Shotgun Ammo Box (Beanbag)"
path = /obj/item/weapon/storage/box/beanbags
path = /obj/item/ammo_magazine/ammo_box/b12g/beanbag
item_cost = 10 // Discount due to it being LTL.
/datum/uplink_item/item/ammo/g12/pellet
name = "12g Shotgun Ammo Box (Pellet)"
path = /obj/item/weapon/storage/box/shotgunshells
path =/obj/item/ammo_magazine/ammo_box/b12g/pellet
/datum/uplink_item/item/ammo/g12/stun
name = "12g Shotgun Ammo Box (Stun)"
path = /obj/item/weapon/storage/box/stunshells
path = /obj/item/ammo_magazine/ammo_box/b12g/stunshell
item_cost = 10 // Discount due to it being LTL.
/datum/uplink_item/item/ammo/g12/flash
name = "12g Shotgun Ammo Box (Flash)"
path = /obj/item/weapon/storage/box/flashshells
path = /obj/item/ammo_magazine/ammo_box/b12g/flash
item_cost = 10 // Discount due to it being LTL.
/datum/uplink_item/item/ammo/cell