Merge pull request #12603 from b1tt3r1n0/Pouches(again)
Some edits to pouches, and something that can hold sheets.
This commit is contained in:
@@ -444,4 +444,22 @@
|
|||||||
STR.max_combined_w_class = 30
|
STR.max_combined_w_class = 30
|
||||||
STR.max_items = 3
|
STR.max_items = 3
|
||||||
STR.display_numerical_stacking = FALSE
|
STR.display_numerical_stacking = FALSE
|
||||||
STR.can_hold = typecacheof(list(/obj/item/ammo_box/magazine, /obj/item/ammo_casing))
|
STR.can_hold = typecacheof(list(/obj/item/ammo_box/magazine, /obj/item/ammo_casing))
|
||||||
|
|
||||||
|
/obj/item/storage/bag/material
|
||||||
|
name = "material pouch"
|
||||||
|
desc = "A pouch for sheets and RCD ammunition that manages to hang where you would normally put things in your pocket."
|
||||||
|
icon = 'icons/obj/items_and_weapons.dmi'
|
||||||
|
icon_state = "materialpouch"
|
||||||
|
slot_flags = ITEM_SLOT_POCKET
|
||||||
|
w_class = WEIGHT_CLASS_BULKY
|
||||||
|
resistance_flags = FLAMMABLE
|
||||||
|
|
||||||
|
/obj/item/storage/bag/material/ComponentInitialize()
|
||||||
|
. = ..()
|
||||||
|
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
|
||||||
|
STR.max_w_class = WEIGHT_CLASS_NORMAL
|
||||||
|
STR.max_combined_w_class = INFINITY
|
||||||
|
STR.max_items = 2
|
||||||
|
STR.display_numerical_stacking = TRUE
|
||||||
|
STR.can_hold = typecacheof(list(/obj/item/rcd_ammo, /obj/item/stack/sheet))
|
||||||
@@ -25,7 +25,8 @@
|
|||||||
)
|
)
|
||||||
premium = list(/obj/item/storage/belt/utility = 3,
|
premium = list(/obj/item/storage/belt/utility = 3,
|
||||||
/obj/item/storage/box/smart_metal_foam = 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)
|
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
|
refill_canister = /obj/item/vending_refill/engivend
|
||||||
|
|||||||
@@ -15,8 +15,7 @@
|
|||||||
/obj/item/secbat = 5)
|
/obj/item/secbat = 5)
|
||||||
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,
|
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,
|
||||||
/obj/item/storage/fancy/donut_box = 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,
|
premium = list(/obj/item/coin/antagtoken = 1,
|
||||||
/obj/item/clothing/head/helmet/blueshirt = 1,
|
/obj/item/clothing/head/helmet/blueshirt = 1,
|
||||||
/obj/item/clothing/suit/armor/vest/blueshirt = 1,
|
/obj/item/clothing/suit/armor/vest/blueshirt = 1,
|
||||||
@@ -24,7 +23,7 @@
|
|||||||
/obj/item/clothing/gloves/tackler = 5,
|
/obj/item/clothing/gloves/tackler = 5,
|
||||||
/obj/item/grenade/stingbang = 1,
|
/obj/item/grenade/stingbang = 1,
|
||||||
/obj/item/ssword_kit = 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)
|
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
|
||||||
resistance_flags = FIRE_PROOF
|
resistance_flags = FIRE_PROOF
|
||||||
refill_canister = /obj/item/vending_refill/security
|
refill_canister = /obj/item/vending_refill/security
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 131 KiB After Width: | Height: | Size: 132 KiB |
Reference in New Issue
Block a user