Merge branch 'master' into protean-rework

This commit is contained in:
BlackMajor
2023-01-30 00:21:50 +13:00
committed by GitHub
553 changed files with 196571 additions and 301169 deletions

View File

@@ -88,16 +88,25 @@
build_path = /obj/item/device/healthanalyzer/improved
sort_string = "KBAAB"
//YAWN changes
/datum/design/item/medical/advanced_analyzer
name = "advanced health analyzer"
desc = "A prototype version of the improved health analyzer, able to distinguish the location of more serious injuries as well as accurately determine radiation levels, and neurological analysis suites"
desc = "An even more advanced handheld health scanner, complete with a full biosign monitor and on-board radiation and neurological analysis suites."
id = "advanced_analyzer"
req_tech = list(TECH_MAGNET = 6, TECH_BIO = 7, TECH_PHORON = 4)
materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "silver" = 1250, "gold" = 1750, "uranium" = 1000, "plastic" = 500)
req_tech = list(TECH_MAGNET = 7, TECH_BIO = 7, TECH_DATA = 5)
materials = list(MAT_STEEL = 2000, MAT_GLASS = 4000, MAT_SILVER = 3500, MAT_GOLD = 2500, MAT_DIAMOND = 1250)
build_path = /obj/item/device/healthanalyzer/advanced
sort_string = "KBAAC"
/datum/design/item/medical/advanced_roller
name = "advanced roller bed"
desc = "A more advanced version of the regular roller bed, with inbuilt surgical stabilisers and an improved folding system."
id = "roller_bed"
req_tech = list(TECH_BIO = 3, TECH_MATERIAL = 3, TECH_MAGNET = 3)
materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000, MAT_PHORON = 2000)
build_path = /obj/item/roller/adv
sort_string = "KCAAA"
//YAWN changes
/datum/design/item/medical/phasic_analyzer
name = "phasic health analyzer"
desc = "A prototype version of the advanced health analyzer, able to distinguish the location of more serious injuries as well as accurately determine radiation levels, and neurological analysis suites. This analyzer even picks up chemicals in the patient's stomach."
@@ -115,12 +124,3 @@
build_path = /obj/item/bodybag/large
sort_string = "KCAAB" //To be under the roller bed
//End of YAWN changes
/datum/design/item/medical/advanced_roller
name = "advanced roller bed"
desc = "A more advanced version of the regular roller bed, with inbuilt surgical stabilisers and an improved folding system."
id = "roller_bed"
req_tech = list(TECH_BIO = 3, TECH_MATERIAL = 3, TECH_MAGNET = 3)
materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000, MAT_PHORON = 2000)
build_path = /obj/item/roller/adv
sort_string = "KCAAA"