mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Merge pull request #6675 from VOREStation/upstream-merge-6731
[MIRROR] Adds individual modular armour crates, tweaks old prices
This commit is contained in:
Novacat
GitHub
@@ -32,8 +32,104 @@
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Armor crate"
|
||||
|
||||
/datum/supply_pack/security/carriersblack
|
||||
name = "Armor - Black modular armor"
|
||||
contains = list(
|
||||
/obj/item/clothing/suit/armor/pcarrier,
|
||||
/obj/item/clothing/accessory/armor/armguards,
|
||||
/obj/item/clothing/accessory/armor/legguards,
|
||||
/obj/item/clothing/accessory/storage/pouches,
|
||||
)
|
||||
cost = 30
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Plate Carrier crate"
|
||||
|
||||
/datum/supply_pack/security/carriersblue
|
||||
name = "Armor - Blue modular armor"
|
||||
contains = list(
|
||||
/obj/item/clothing/suit/armor/pcarrier/blue,
|
||||
/obj/item/clothing/accessory/armor/armguards/blue,
|
||||
/obj/item/clothing/accessory/armor/legguards/blue,
|
||||
/obj/item/clothing/accessory/storage/pouches/blue,
|
||||
)
|
||||
cost = 30
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Plate Carrier crate"
|
||||
|
||||
/datum/supply_pack/security/carriersgreen
|
||||
name = "Armor - Blue modular armor"
|
||||
contains = list(
|
||||
/obj/item/clothing/suit/armor/pcarrier/green,
|
||||
/obj/item/clothing/accessory/armor/armguards/green,
|
||||
/obj/item/clothing/accessory/armor/legguards/green,
|
||||
/obj/item/clothing/accessory/storage/pouches/green,
|
||||
)
|
||||
cost = 30
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Plate Carrier crate"
|
||||
|
||||
/datum/supply_pack/security/carriersnavy
|
||||
name = "Armor - Navy modular armor"
|
||||
contains = list(
|
||||
/obj/item/clothing/suit/armor/pcarrier/navy,
|
||||
/obj/item/clothing/accessory/armor/armguards/navy,
|
||||
/obj/item/clothing/accessory/armor/legguards/navy,
|
||||
/obj/item/clothing/accessory/storage/pouches/navy,
|
||||
)
|
||||
cost = 30
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Plate Carrier crate"
|
||||
|
||||
/datum/supply_pack/security/carrierstan
|
||||
name = "Armor - Tan modular armor"
|
||||
contains = list(
|
||||
/obj/item/clothing/suit/armor/pcarrier/tan,
|
||||
/obj/item/clothing/accessory/armor/armguards/tan,
|
||||
/obj/item/clothing/accessory/armor/legguards/tan,
|
||||
/obj/item/clothing/accessory/storage/pouches/tan,
|
||||
)
|
||||
cost = 30
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Plate Carrier crate"
|
||||
|
||||
/datum/supply_pack/security/armorplate
|
||||
name = "Armor - Security light armor plate"
|
||||
contains = list(
|
||||
/obj/item/clothing/accessory/armor/armorplate,
|
||||
)
|
||||
cost = 5
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Armor plate crate"
|
||||
|
||||
/datum/supply_pack/security/armorplatestab
|
||||
name = "Armor - Security stab armor plate"
|
||||
contains = list(
|
||||
/obj/item/clothing/accessory/armor/armorplate/stab,
|
||||
)
|
||||
cost = 10
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Armor plate crate"
|
||||
|
||||
/datum/supply_pack/security/armorplatemedium
|
||||
name = "Armor - Security armor plate"
|
||||
contains = list(
|
||||
/obj/item/clothing/accessory/armor/armorplate/medium,
|
||||
)
|
||||
cost = 10
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Armor plate crate"
|
||||
|
||||
/datum/supply_pack/security/armorplatetac
|
||||
name = "Armor - Security medium armor plate"
|
||||
contains = list(
|
||||
/obj/item/clothing/accessory/armor/armorplate/tactical,
|
||||
)
|
||||
cost = 15
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Armor plate crate"
|
||||
|
||||
/datum/supply_pack/randomised/security/carriers
|
||||
name = "Armor - Plate carriers"
|
||||
name = "Armor - Surplus plate carriers"
|
||||
num_contained = 5
|
||||
contains = list(
|
||||
/obj/item/clothing/suit/armor/pcarrier,
|
||||
@@ -43,7 +139,7 @@
|
||||
/obj/item/clothing/suit/armor/pcarrier/tan,
|
||||
/obj/item/clothing/suit/armor/pcarrier/press
|
||||
)
|
||||
cost = 20
|
||||
cost = 10
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Plate Carrier crate"
|
||||
|
||||
@@ -82,7 +178,7 @@
|
||||
containername = "Helmet Covers crate"
|
||||
|
||||
/datum/supply_pack/randomised/security/armorplates
|
||||
name = "Armor - Security armor plates"
|
||||
name = "Armor - Surplus security armor plates"
|
||||
num_contained = 5
|
||||
contains = list(
|
||||
/obj/item/clothing/accessory/armor/armorplate,
|
||||
@@ -96,12 +192,12 @@
|
||||
/obj/item/clothing/accessory/armor/armorplate/riot,
|
||||
/obj/item/clothing/accessory/armor/armorplate/bulletproof
|
||||
)
|
||||
cost = 50
|
||||
cost = 40
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Armor plate crate"
|
||||
|
||||
/datum/supply_pack/randomised/security/carrierarms
|
||||
name = "Armor - Security armguard attachments"
|
||||
name = "Armor - Surplus security armguard attachments"
|
||||
num_contained = 5
|
||||
contains = list(
|
||||
/obj/item/clothing/accessory/armor/armguards,
|
||||
@@ -113,12 +209,12 @@
|
||||
/obj/item/clothing/accessory/armor/armguards/riot,
|
||||
/obj/item/clothing/accessory/armor/armguards/bulletproof
|
||||
)
|
||||
cost = 50
|
||||
cost = 40
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Armor plate crate"
|
||||
|
||||
/datum/supply_pack/randomised/security/carrierlegs
|
||||
name = "Armor - Security legguard attachments"
|
||||
name = "Armor - Surplus security legguard attachments"
|
||||
num_contained = 5
|
||||
contains = list(
|
||||
/obj/item/clothing/accessory/armor/legguards,
|
||||
@@ -130,12 +226,12 @@
|
||||
/obj/item/clothing/accessory/armor/legguards/riot,
|
||||
/obj/item/clothing/accessory/armor/legguards/bulletproof
|
||||
)
|
||||
cost = 50
|
||||
cost = 40
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Armor plate crate"
|
||||
|
||||
/datum/supply_pack/randomised/security/carrierbags
|
||||
name = "Armor - Security pouch attachments"
|
||||
name = "Armor - Surplus security pouch attachments"
|
||||
num_contained = 5
|
||||
contains = list(
|
||||
/obj/item/clothing/accessory/storage/pouches,
|
||||
@@ -149,7 +245,7 @@
|
||||
/obj/item/clothing/accessory/storage/pouches/large/green,
|
||||
/obj/item/clothing/accessory/storage/pouches/large/tan
|
||||
)
|
||||
cost = 60
|
||||
cost = 50
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Armor plate crate"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user