shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pouches (#12432)

Browse Source 
* The Ammo Pouch

It holds magazines and most forms of ammo.

* The Ammo Pouch

It holds magazines and most forms of ammo.
This commit is contained in:
b1tt3r1n0
2020-06-09 06:22:39 -04:00
committed by GitHub
parent e593bfe423
commit 764ba26ace
5 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/cargo/packs/costumes_toys.dm
View File

@@ -71,7 +71,8 @@
/obj/item/clothing/mask/gas/syndicate,
/obj/item/clothing/neck/necklace/dope,
/obj/item/vending_refill/donksoft,
/obj/item/circuitboard/computer/arcade/amputation)
/obj/item/circuitboard/computer/arcade/amputation,
/obj/item/storage/bag/ammo)
crate_name = "crate"
/datum/supply_pack/costumes_toys/foamforce

6
code/modules/uplink/uplink_items/uplink_devices.dm
View File

@@ -100,6 +100,12 @@
cost = 1
exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
/datum/uplink_item/device_tools/ammo_pouch
name = "Ammo Pouch"
desc = "A small yet large enough pouch that can fit in your pocket, and has room for three magazines."
item = /obj/item/storage/bag/ammo
cost = 1
/datum/uplink_item/device_tools/fakenucleardisk
name = "Decoy Nuclear Authentication Disk"
desc = "It's just a normal disk. Visually it's identical to the real deal, but it won't hold up under closer scrutiny by the Captain. \

6
code/modules/vending/security.dm
View File

@@ -15,13 +15,15 @@
/obj/item/secbat = 5)
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,
/obj/item/storage/fancy/donut_box = 2,
/obj/item/ssword_kit = 1)
/obj/item/ssword_kit = 1,
/obj/item/storage/bag/ammo = 1)
premium = list(/obj/item/coin/antagtoken = 1,
/obj/item/clothing/head/helmet/blueshirt = 1,
/obj/item/clothing/suit/armor/vest/blueshirt = 1,
/obj/item/clothing/under/rank/security/officer/blueshirt = 1,
/obj/item/clothing/gloves/tackler = 5,
/obj/item/ssword_kit = 1)
/obj/item/ssword_kit = 1,
/obj/item/storage/bag/ammo = 2)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/security