From 62a02f09f1bff45c21d1aeb550ca1171edb74c19 Mon Sep 17 00:00:00 2001 From: nemvar <47324920+nemvar@users.noreply.github.com> Date: Sun, 13 Oct 2019 05:50:12 +0200 Subject: [PATCH] Medanalyzers are now the tier 2 option for scanning people. (#46917) About The Pull Request Removes medical analyzers from medkits. Removes the ability to print medical scanners from the autolathe. Why It's Good For The Game Medical analyzers are currently probably one of the common items in the game. Not only do mappers place them all over their maps but they are also in every medkits, which, funnily enough, are also fucking everywhere. This leads me what I call the Cobb's Assortment of medical scanner quality: Tier 1: Ghetto tier. Click your healthdoll, see if you burned for fingers on the kitchen plate. Tier 2: Normal Analyzers. Somewhat restricted but still fairly common. Almost every department has one but you won't find on randomly in the hallways. Tier 3: Advanced Analyzers: The shit medbay can print after research, nuff said. Changelog cl balance: Removed health analyzers from medkits. Removed the ability to print health analyzers from autolathes. /cl --- code/game/objects/items/storage/firstaid.dm | 19 +++++++------------ .../research/designs/autolathe_designs.dm | 9 --------- .../research/designs/medical_designs.dm | 9 +++++++++ 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 98a649ecedc..7b6d451c0f9 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -34,8 +34,7 @@ /obj/item/stack/medical/gauze = 1, /obj/item/stack/medical/bruise_pack = 2, /obj/item/stack/medical/ointment = 2, - /obj/item/reagent_containers/hypospray/medipen = 1, - /obj/item/healthanalyzer = 1) + /obj/item/reagent_containers/hypospray/medipen = 1) generate_items_inside(items_inside,src) /obj/item/storage/firstaid/medical @@ -107,11 +106,11 @@ /obj/item/stack/medical/bruise_pack = 2, /obj/item/stack/medical/ointment = 2, /obj/item/reagent_containers/hypospray/medipen = 1, - /obj/item/healthanalyzer = 1, /obj/item/surgical_drapes = 1, /obj/item/scalpel = 1, /obj/item/hemostat = 1, - /obj/item/cautery = 1) + /obj/item/cautery = 1, + /obj/item/healthanalyzer = 1) generate_items_inside(items_inside,src) /obj/item/storage/firstaid/ancient @@ -149,8 +148,7 @@ /obj/item/reagent_containers/pill/patch/aiuri = 3, /obj/item/reagent_containers/spray/rhigoxane = 1, /obj/item/reagent_containers/hypospray/medipen/oxandrolone = 1, - /obj/item/reagent_containers/hypospray/medipen = 1, - /obj/item/healthanalyzer = 1) + /obj/item/reagent_containers/hypospray/medipen = 1) generate_items_inside(items_inside,src) /obj/item/storage/firstaid/toxin @@ -175,8 +173,7 @@ /obj/item/storage/pill_bottle/multiver/less = 1, /obj/item/reagent_containers/syringe/syriniver = 3, /obj/item/storage/pill_bottle/potassiodide = 1, - /obj/item/reagent_containers/hypospray/medipen/penacid = 1, - /obj/item/healthanalyzer = 1) + /obj/item/reagent_containers/hypospray/medipen/penacid = 1) generate_items_inside(items_inside,src) /obj/item/storage/firstaid/o2 @@ -201,8 +198,7 @@ /obj/item/reagent_containers/syringe/convermol = 3, /obj/item/reagent_containers/hypospray/medipen/salbutamol = 1, /obj/item/reagent_containers/hypospray/medipen = 1, - /obj/item/storage/pill_bottle/iron = 1, - /obj/item/healthanalyzer = 1) + /obj/item/storage/pill_bottle/iron = 1) generate_items_inside(items_inside,src) /obj/item/storage/firstaid/brute @@ -227,8 +223,7 @@ /obj/item/reagent_containers/pill/patch/libital = 3, /obj/item/stack/medical/gauze = 1, /obj/item/storage/pill_bottle/trophazole = 1, - /obj/item/reagent_containers/hypospray/medipen/salacid = 1, - /obj/item/healthanalyzer = 1) + /obj/item/reagent_containers/hypospray/medipen/salacid = 1) generate_items_inside(items_inside,src) /obj/item/storage/firstaid/advanced diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 58731c49994..6deece3441a 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -488,15 +488,6 @@ category = list("initial", "Medical", "Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SERVICE -/datum/design/healthanalyzer - name = "Health Analyzer" - id = "healthanalyzer" - build_type = AUTOLATHE | PROTOLATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 50) - build_path = /obj/item/healthanalyzer - category = list("initial", "Medical", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL - /datum/design/pillbottle name = "Pill Bottle" id = "pillbottle" diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 1b45d34d47a..ad41674f246 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -2,6 +2,15 @@ ////////////Medical Tools//////////////// ///////////////////////////////////////// +/datum/design/healthanalyzer + name = "Health Analyzer" + id = "healthanalyzer" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 500, /datum/material/glass = 50) + build_path = /obj/item/healthanalyzer + category = list("Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + /datum/design/mmi name = "Man-Machine Interface" desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity."