Merge branch 'master' into Cargo-crate-stuff

This commit is contained in:
Razgriz
2022-05-14 14:41:35 -07:00
committed by GitHub
106 changed files with 36659 additions and 34328 deletions

View File

@@ -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"*/

View File

@@ -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"