Merge branch 'master' into upstream-merge-10502

This commit is contained in:
Nadyr
2021-05-31 03:17:04 -04:00
committed by GitHub
84 changed files with 1800 additions and 1556 deletions
+12 -12
View File
@@ -16,7 +16,7 @@
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2,
)
cost = 40
cost = 35
containertype = /obj/structure/closet/crate/secure/aether
containername = "Atmospheric voidsuit crate"
access = access_atmospherics
@@ -30,7 +30,7 @@
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2,
)
cost = 50
cost = 60
containertype = /obj/structure/closet/crate/secure/aether
containername = "Heavy Duty Atmospheric voidsuit crate"
access = access_atmospherics
@@ -44,7 +44,7 @@
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
)
cost = 40
cost = 35
containertype = /obj/structure/closet/crate/secure/xion
containername = "Engineering voidsuit crate"
access = access_engine_equip
@@ -58,7 +58,7 @@
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
)
cost = 40
cost = 35
containertype = /obj/structure/closet/crate/secure/xion
containername = "Engineering Construction voidsuit crate"
access = access_engine_equip
@@ -72,7 +72,7 @@
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
)
cost = 45
cost = 35
containertype = /obj/structure/closet/crate/secure/xion
containername = "Engineering Hazmat voidsuit crate"
access = access_engine_equip
@@ -86,7 +86,7 @@
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
)
cost = 50
cost = 60
containertype = /obj/structure/closet/crate/secure/xion
containername = "Reinforced Engineering voidsuit crate"
access = access_engine_equip
@@ -100,7 +100,7 @@
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
)
cost = 40
cost = 35
containertype = /obj/structure/closet/crate/secure/veymed
containername = "Medical voidsuit crate"
access = access_medical_equip
@@ -114,7 +114,7 @@
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
)
cost = 40
cost = 35
containertype = /obj/structure/closet/crate/secure/veymed
containername = "Medical EMT voidsuit crate"
access = access_medical_equip
@@ -128,7 +128,7 @@
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
)
cost = 45
cost = 35
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Medical Biohazard voidsuit crate"
access = access_medical_equip
@@ -167,7 +167,7 @@
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
)
cost = 40
cost = 35
containertype = /obj/structure/closet/crate/secure/heph
containername = "Security voidsuit crate"
@@ -207,7 +207,7 @@
/obj/item/clothing/mask/breath = 2,
/obj/item/weapon/tank/oxygen = 2
)
cost = 40
cost = 35
containertype = /obj/structure/closet/crate/secure/xion
containername = "Mining voidsuit crate"
access = access_mining
@@ -220,7 +220,7 @@
/obj/item/clothing/mask/breath = 2,
/obj/item/weapon/tank/oxygen = 2
)
cost = 50
cost = 60
containertype = /obj/structure/closet/crate/secure/grayson
containername = "Frontier Mining voidsuit crate"
access = access_mining
+7 -78
View File
@@ -1,84 +1,13 @@
/datum/supply_pack/voidsuits/atmos
contains = list(
/obj/item/clothing/suit/space/void/atmos = 3,
/obj/item/clothing/head/helmet/space/void/atmos = 3,
/obj/item/clothing/mask/breath = 3,
/obj/item/clothing/shoes/magboots = 3,
/obj/item/weapon/tank/oxygen = 3,
)
/datum/supply_pack/voidsuits/engineering
contains = list(
/obj/item/clothing/suit/space/void/engineering = 3,
/obj/item/clothing/head/helmet/space/void/engineering = 3,
/obj/item/clothing/mask/breath = 3,
/obj/item/clothing/shoes/magboots = 3,
/obj/item/weapon/tank/oxygen = 3
)
/datum/supply_pack/voidsuits/medical
contains = list(
/obj/item/clothing/suit/space/void/medical = 3,
/obj/item/clothing/head/helmet/space/void/medical = 3,
/obj/item/clothing/mask/breath = 3,
/obj/item/clothing/shoes/magboots = 3,
/obj/item/weapon/tank/oxygen = 3
)
/datum/supply_pack/voidsuits/medical/alt
contains = list(
/obj/item/clothing/suit/space/void/medical/alt = 3,
/obj/item/clothing/head/helmet/space/void/medical/alt = 3,
/obj/item/clothing/mask/breath = 3,
/obj/item/clothing/shoes/magboots = 3,
/obj/item/weapon/tank/oxygen = 3
)
/datum/supply_pack/voidsuits/security
contains = list(
/obj/item/clothing/suit/space/void/security = 3,
/obj/item/clothing/head/helmet/space/void/security = 3,
/obj/item/clothing/mask/breath = 3,
/obj/item/clothing/shoes/magboots = 3,
/obj/item/weapon/tank/oxygen = 3
)
/datum/supply_pack/voidsuits/security/crowd
contains = list(
/obj/item/clothing/suit/space/void/security/riot = 3,
/obj/item/clothing/head/helmet/space/void/security/riot = 3,
/obj/item/clothing/mask/breath = 3,
/obj/item/clothing/shoes/magboots = 3,
/obj/item/weapon/tank/oxygen = 3
)
/datum/supply_pack/voidsuits/security/alt
contains = list(
/obj/item/clothing/suit/space/void/security/alt = 3,
/obj/item/clothing/head/helmet/space/void/security/alt = 3,
/obj/item/clothing/mask/breath = 3,
/obj/item/clothing/shoes/magboots = 3,
/obj/item/weapon/tank/oxygen = 3
)
/datum/supply_pack/voidsuits/supply
contains = list(
/obj/item/clothing/suit/space/void/mining = 3,
/obj/item/clothing/head/helmet/space/void/mining = 3,
/obj/item/clothing/mask/breath = 3,
/obj/item/weapon/tank/oxygen = 3
)
/datum/supply_pack/voidsuits/explorer
name = "Exploration voidsuits"
contains = list(
/obj/item/clothing/suit/space/void/exploration = 3,
/obj/item/clothing/head/helmet/space/void/exploration = 3,
/obj/item/clothing/mask/breath = 3,
/obj/item/clothing/shoes/magboots = 3,
/obj/item/weapon/tank/oxygen = 3
/obj/item/clothing/suit/space/void/exploration = 2,
/obj/item/clothing/head/helmet/space/void/exploration = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
)
cost = 50
cost = 45
containertype = /obj/structure/closet/crate/secure
containername = "Exploration voidsuit crate"
access = access_explorer
@@ -92,7 +21,7 @@
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
)
cost = 35
cost = 45
containertype = /obj/structure/closet/crate/secure
containername = "Expedition Medic voidsuit crate"
access = access_explorer