cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 03:56:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into micromechs

Browse Source
This commit is contained in:
Aronai Sieyes
2018-05-10 15:49:03 -04:00
committed by GitHub
parent fea679888a 7ad1a817de
commit dccb204c56
327 changed files with 172605 additions and 124722 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks/engineering_vr.dm
+1 -2
View File
@@ -7,8 +7,7 @@
/datum/supply_packs/eng/radsuit
contains = list(
/obj/item/clothing/suit/radiation = 2,
/obj/item/clothing/suit/radiation/taur = 1,
/obj/item/clothing/suit/radiation = 3,
/obj/item/clothing/head/radiation = 3
)
code/datums/supplypacks/hospitality_vr.dm
+1 -1
View File
@@ -5,7 +5,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cheeseburger,
/obj/item/weapon/reagent_containers/food/snacks/jellyburger,
/obj/item/weapon/reagent_containers/food/snacks/tofuburger,
/obj/item/weapon/reagent_containers/food/snacks/fishburger
/obj/item/weapon/reagent_containers/food/snacks/fries
)
name = "Burger crate"
cost = 25
code/datums/supplypacks/medical_vr.dm
+3 -7
View File
@@ -1,13 +1,10 @@
/datum/supply_packs/med/medicalbiosuits
contains = list(
/obj/item/clothing/head/bio_hood/scientist = 3,
/obj/item/clothing/suit/bio_suit/scientist = 2,
/obj/item/clothing/suit/bio_suit/scientist/taur = 1,
/obj/item/clothing/suit/bio_suit/virology = 2,
/obj/item/clothing/suit/bio_suit/virology/taur = 1,
/obj/item/clothing/suit/bio_suit/scientist = 3,
/obj/item/clothing/suit/bio_suit/virology = 3,
/obj/item/clothing/head/bio_hood/virology = 3,
/obj/item/clothing/suit/bio_suit/cmo,
/obj/item/clothing/suit/bio_suit/cmo/taur,
/obj/item/clothing/head/bio_hood/cmo,
/obj/item/clothing/shoes/white = 7,
/obj/item/clothing/mask/gas = 7,
@@ -20,8 +17,7 @@
/datum/supply_packs/med/virologybiosuits
name = "Virology biohazard gear"
contains = list(
/obj/item/clothing/suit/bio_suit/virology = 2,
/obj/item/clothing/suit/bio_suit/virology/taur = 1,
/obj/item/clothing/suit/bio_suit/virology = 3,
/obj/item/clothing/head/bio_hood/virology = 3,
/obj/item/clothing/mask/gas = 3,
/obj/item/weapon/tank/oxygen = 3,
code/datums/supplypacks/robotics_vr.dm
+39
View File
@@ -32,3 +32,42 @@
containertype = /obj/structure/closet/crate/secure/science
containername = "APLU \"Weasel\" Circuit Crate"
access = access_robotics
/datum/supply_packs/robotics/some_robolimbs
name = "Basic Robolimb Blueprints"
contains = list(
/obj/item/weapon/disk/limb/morpheus,
/obj/item/weapon/disk/limb/xion,
/obj/item/weapon/disk/limb/talon
)
cost = 15
containertype = /obj/structure/closet/crate/secure
containername = "Basic Robolimb Blueprint Crate"
access = access_robotics
/datum/supply_packs/robotics/all_robolimbs
name = "Advanced Robolimb Blueprints"
contains = list(
/obj/item/weapon/disk/limb/bishop,
/obj/item/weapon/disk/limb/hephaestus,
/obj/item/weapon/disk/limb/morpheus,
/obj/item/weapon/disk/limb/veymed,
/obj/item/weapon/disk/limb/wardtakahashi,
/obj/item/weapon/disk/limb/xion,
/obj/item/weapon/disk/limb/zenghu,
/obj/item/weapon/disk/limb/talon,
/obj/item/weapon/disk/limb/dsi_tajaran,
/obj/item/weapon/disk/limb/dsi_lizard,
/obj/item/weapon/disk/limb/dsi_sergal,
/obj/item/weapon/disk/limb/dsi_nevrean,
/obj/item/weapon/disk/limb/dsi_vulpkanin,
/obj/item/weapon/disk/limb/dsi_akula,
/obj/item/weapon/disk/limb/dsi_spider,
/obj/item/weapon/disk/limb/dsi_teshari,
/obj/item/weapon/disk/limb/eggnerdltd,
/obj/item/weapon/disk/limb/eggnerdltdred
)
cost = 40
containertype = /obj/structure/closet/crate/secure
containername = "Advanced Robolimb Blueprint Crate"
access = access_robotics
code/datums/supplypacks/science_vr.dm
-37
View File
@@ -1,40 +1,3 @@
/datum/supply_packs/sci/some_robolimbs
name = "Basic Robolimb Blueprints"
contains = list(
/obj/item/weapon/disk/limb/morpheus,
/obj/item/weapon/disk/limb/xion,
/obj/item/weapon/disk/limb/talon
)
cost = 15
containertype = /obj/structure/closet/crate/secure
containername = "Basic Robolimb Blueprint Crate"
access = access_robotics
/datum/supply_packs/sci/all_robolimbs
name = "Advanced Robolimb Blueprints"
contains = list(
/obj/item/weapon/disk/limb/bishop,
/obj/item/weapon/disk/limb/hephaestus,
/obj/item/weapon/disk/limb/morpheus,
/obj/item/weapon/disk/limb/veymed,
/obj/item/weapon/disk/limb/wardtakahashi,
/obj/item/weapon/disk/limb/xion,
/obj/item/weapon/disk/limb/zenghu,
/obj/item/weapon/disk/limb/talon,
/obj/item/weapon/disk/limb/dsi_tajaran,
/obj/item/weapon/disk/limb/dsi_lizard,
/obj/item/weapon/disk/limb/dsi_sergal,
/obj/item/weapon/disk/limb/dsi_nevrean,
/obj/item/weapon/disk/limb/dsi_vulpkanin,
/obj/item/weapon/disk/limb/dsi_akula,
/obj/item/weapon/disk/limb/dsi_spider,
/obj/item/weapon/disk/limb/eggnerdltd,
/obj/item/weapon/disk/limb/eggnerdltdred
)
cost = 40
containertype = /obj/structure/closet/crate/secure
containername = "Advanced Robolimb Blueprint Crate"
access = access_robotics
/*
/datum/supply_packs/sci/dune_buggy
name = "Exploration Dune Buggy"
code/datums/supplypacks/security_vr.dm
+1 -2
View File
@@ -20,8 +20,7 @@
contains = list(
/obj/item/clothing/head/bio_hood/security = 3,
/obj/item/clothing/under/rank/security = 3,
/obj/item/clothing/suit/bio_suit/security = 2,
/obj/item/clothing/suit/bio_suit/security/taur = 1,
/obj/item/clothing/suit/bio_suit/security = 3,
/obj/item/clothing/shoes/white = 3,
/obj/item/clothing/mask/gas = 3,
/obj/item/weapon/tank/oxygen = 3,
code/datums/supplypacks/voidsuits.dm
+2
View File
@@ -172,6 +172,7 @@
cost = 40
containertype = "/obj/structure/closet/crate/secure"
containername = "Security Crowd Control voidsuit crate"
access = access_armory
/datum/supply_packs/voidsuits/security/alt
name = "Security EVA Riot voidsuits"
@@ -185,6 +186,7 @@
cost = 50
containertype = "/obj/structure/closet/crate/secure"
containername = "Security EVA Riot voidsuit crate"
access = access_armory
/datum/supply_packs/voidsuits/supply
name = "Mining voidsuits"
code/datums/supplypacks/voidsuits_vr.dm
+8 -17
View File
@@ -1,7 +1,6 @@
/datum/supply_packs/voidsuits/atmos
contains = list(
/obj/item/clothing/suit/space/void/atmos = 2,
/obj/item/clothing/suit/space/void/atmos/taur = 1,
/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,
@@ -10,8 +9,7 @@
/datum/supply_packs/voidsuits/engineering
contains = list(
/obj/item/clothing/suit/space/void/engineering = 2,
/obj/item/clothing/suit/space/void/engineering/taur = 1,
/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,
@@ -20,8 +18,7 @@
/datum/supply_packs/voidsuits/medical
contains = list(
/obj/item/clothing/suit/space/void/medical = 2,
/obj/item/clothing/suit/space/void/medical/taur = 1,
/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,
@@ -30,19 +27,16 @@
/datum/supply_packs/voidsuits/medical/alt
contains = list(
/obj/item/clothing/suit/space/void/medical/alt = 2,
/obj/item/clothing/suit/space/void/medical/alt/taur = 1,
/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_packs/voidsuits/security
contains = list(
/obj/item/clothing/suit/space/void/security = 2,
/obj/item/clothing/suit/space/void/security/taur =1,
/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,
@@ -51,8 +45,7 @@
/datum/supply_packs/voidsuits/security/crowd
contains = list(
/obj/item/clothing/suit/space/void/security/riot = 2,
/obj/item/clothing/suit/space/void/security/riot/taur = 1,
/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,
@@ -61,8 +54,7 @@
/datum/supply_packs/voidsuits/security/alt
contains = list(
/obj/item/clothing/suit/space/void/security/alt = 2,
/obj/item/clothing/suit/space/void/security/alt/taur =1,
/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,
@@ -72,8 +64,7 @@
/datum/supply_packs/voidsuits/supply
name = "Mining voidsuits"
contains = list(
/obj/item/clothing/suit/space/void/mining = 2,
/obj/item/clothing/suit/space/void/mining/taur = 1,
/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