mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Merge branch 'master' into Cargo-crate-stuff
This commit is contained in:
@@ -106,7 +106,7 @@
|
||||
cost = 35
|
||||
containertype = /obj/structure/closet/crate/aether
|
||||
containername = "Emergency crate"
|
||||
|
||||
/*
|
||||
/datum/supply_pack/atmos/firefighting
|
||||
name = "Firefighting equipment"
|
||||
contains = list(
|
||||
@@ -118,4 +118,4 @@
|
||||
)
|
||||
cost = 35
|
||||
containertype = /obj/structure/closet/crate/aether
|
||||
containername = "Firefighting crate"
|
||||
containername = "Firefighting crate"*/
|
||||
@@ -287,7 +287,7 @@
|
||||
containertype = /obj/structure/closet/crate/secure/lawson
|
||||
containername = "Riot armor crate"
|
||||
access = access_armory
|
||||
|
||||
/*
|
||||
/datum/supply_pack/security/riot_sprayer
|
||||
name = "Gear - Riot sprayer"
|
||||
contains = list(
|
||||
@@ -296,7 +296,7 @@
|
||||
cost = 40
|
||||
containertype = /obj/structure/closet/crate/secure/lawson
|
||||
containername = "Riot sprayer crate"
|
||||
access = access_armory
|
||||
access = access_armory*/
|
||||
|
||||
/datum/supply_pack/security/ablative_armor
|
||||
name = "Armor - Ablative"
|
||||
|
||||
Reference in New Issue
Block a user