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

Deconflict

Browse Source
This commit is contained in:
Cyantime
2017-09-16 19:00:30 -04:00
parent 49a62057c3 1115d2d566
commit 68056dd5f2
341 changed files with 30689 additions and 22805 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/mind.dm
+1 -1
View File
@@ -499,7 +499,7 @@
if(!mind.assigned_role) mind.assigned_role = "Assistant" //defualt
//slime
/mob/living/carbon/slime/mind_initialize()
/mob/living/simple_animal/slime/mind_initialize()
..()
mind.assigned_role = "slime"
code/datums/supplypacks/engineering_vr.dm
+6 -6
View File
@@ -1,6 +1,6 @@
/datum/supply_packs/eng/thermoregulator
contains = list(/obj/machinery/power/thermoregulator)
name = "Thermal Regulator"
cost = 30
containertype = /obj/structure/closet/crate/large
containername = "thermal regulator crate"
/datum/supply_packs/eng/radsuit
contains = list(
/obj/item/clothing/suit/radiation = 2,
/obj/item/clothing/suit/radiation/taur = 1,
/obj/item/clothing/head/radiation = 3
)
code/datums/supplypacks/medical.dm
+7 -7
View File
@@ -90,7 +90,7 @@
/datum/supply_packs/med/sterile
name = "Sterile equipment crate"
contains = list(
/obj/item/clothing/under/rank/medical/green = 2,
/obj/item/clothing/under/rank/medical/scrubs/green = 2,
/obj/item/clothing/head/surgery/green = 2,
/obj/item/weapon/storage/box/masks,
/obj/item/weapon/storage/box/gloves,
@@ -188,8 +188,8 @@
contains = list(
/obj/item/weapon/storage/belt/medical/emt,
/obj/item/device/radio/headset/headset_med,
/obj/item/clothing/under/rank/medical/black,
/obj/item/clothing/accessory/armband/medgreen,
/obj/item/clothing/under/rank/medical/scrubs/black,
/obj/item/clothing/accessory/armband/medblue,
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/suit/storage/toggle/labcoat/emt,
/obj/item/clothing/under/rank/medical/paramedic,
@@ -234,10 +234,10 @@
name = "Medical scrubs"
contains = list(
/obj/item/clothing/shoes/white = 3,,
/obj/item/clothing/under/rank/medical/blue = 3,
/obj/item/clothing/under/rank/medical/green = 3,
/obj/item/clothing/under/rank/medical/purple = 3,
/obj/item/clothing/under/rank/medical/black = 3,
/obj/item/clothing/under/rank/medical/scrubs = 3,
/obj/item/clothing/under/rank/medical/scrubs/green = 3,
/obj/item/clothing/under/rank/medical/scrubs/purple = 3,
/obj/item/clothing/under/rank/medical/scrubs/black = 3,
/obj/item/clothing/head/surgery = 3,
/obj/item/clothing/head/surgery/purple = 3,
/obj/item/clothing/head/surgery/blue = 3,
code/datums/supplypacks/medical_vr.dm
+34
View File
@@ -0,0 +1,34 @@
/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/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,
/obj/item/weapon/tank/oxygen = 7,
/obj/item/weapon/storage/box/masks,
/obj/item/weapon/storage/box/gloves
)
cost = 40
/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/head/bio_hood/virology = 3,
/obj/item/clothing/mask/gas = 3,
/obj/item/weapon/tank/oxygen = 3,
/obj/item/weapon/storage/box/masks,
/obj/item/weapon/storage/box/gloves
)
cost = 40
containertype = "/obj/structure/closet/crate/secure"
containername = "Virology biohazard equipment"
access = access_medical_equip
code/datums/supplypacks/security_vr.dm
+15 -1
View File
@@ -7,4 +7,18 @@
access = list(
access_security,
access_xenobiology)
*/
*/
/datum/supply_packs/security/biosuit
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/shoes/white = 3,
/obj/item/clothing/mask/gas = 3,
/obj/item/weapon/tank/oxygen = 3,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/weapon/storage/box/gloves
)
cost = 40
code/datums/supplypacks/voidsuits_vr.dm
+80
View File
@@ -0,0 +1,80 @@
/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/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_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/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_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/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_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/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/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_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/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_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/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_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/head/helmet/space/void/mining = 3,
/obj/item/clothing/mask/breath = 3,
/obj/item/weapon/tank/oxygen = 3
)