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

Merge pull request #12603 from b1tt3r1n0/Pouches(again)

Browse Source 
Some edits to pouches, and something that can hold sheets.
This commit is contained in:
silicons
2020-06-27 14:54:57 -07:00
committed by GitHub
parent 5d1e806bdc a780b9037c
commit 2ab69c0170
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/vending/engivend.dm
View File

@@ -25,7 +25,8 @@
)
premium = list(/obj/item/storage/belt/utility = 3,
/obj/item/storage/box/smart_metal_foam = 3,
/obj/item/rcd_ammo/large = 5
/obj/item/rcd_ammo/large = 5,
/obj/item/storage/bag/material = 3
)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
refill_canister = /obj/item/vending_refill/engivend

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

@@ -15,8 +15,7 @@
/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/storage/bag/ammo = 1)
/obj/item/ssword_kit = 1)
premium = list(/obj/item/coin/antagtoken = 1,
/obj/item/clothing/head/helmet/blueshirt = 1,
/obj/item/clothing/suit/armor/vest/blueshirt = 1,
@@ -24,7 +23,7 @@
/obj/item/clothing/gloves/tackler = 5,
/obj/item/grenade/stingbang = 1,
/obj/item/ssword_kit = 1,
/obj/item/storage/bag/ammo = 2)
/obj/item/storage/bag/ammo = 3)
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