From 3f14279fe61e06907a29cdb28da238b735265f03 Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx <1534478+GalacticRuler@users.noreply.github.com> Date: Fri, 17 Jun 2022 21:19:23 -0500 Subject: [PATCH 1/4] Update augments_eyes.dm --- code/modules/surgery/organs/augments_eyes.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm index 1289ddc587e1..458c91225aa2 100644 --- a/code/modules/surgery/organs/augments_eyes.dm +++ b/code/modules/surgery/organs/augments_eyes.dm @@ -45,3 +45,9 @@ name = "Contraband Security HUD Implant" desc = "A Cybersun Industries brand Security HUD Implant. These illicit cybernetic eye implants will display a security HUD over everything you see." syndicate_implant = TRUE + +/obj/item/organ/cyberimp/eyes/hud/science + name = "Scientific Analyzer implant" + desc = "These cybernetic eye implants will allow rapid identification of reagents, and also allow scanning items for research value." + clothing_flags = SCAN_REAGENTS //You can see reagents while wearing science goggles + \ No newline at end of file From 52b35a2edfbbb56680ae8084a0d2729f340eebab Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx <1534478+GalacticRuler@users.noreply.github.com> Date: Sat, 18 Jun 2022 00:33:41 -0500 Subject: [PATCH 2/4] coding is happening... --- code/modules/surgery/organs/augments_eyes.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm index 458c91225aa2..b5038bbd7316 100644 --- a/code/modules/surgery/organs/augments_eyes.dm +++ b/code/modules/surgery/organs/augments_eyes.dm @@ -49,5 +49,3 @@ /obj/item/organ/cyberimp/eyes/hud/science name = "Scientific Analyzer implant" desc = "These cybernetic eye implants will allow rapid identification of reagents, and also allow scanning items for research value." - clothing_flags = SCAN_REAGENTS //You can see reagents while wearing science goggles - \ No newline at end of file From 4b046346f4cfc6b3ca7d76669fba627f2236e898 Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx <1534478+GalacticRuler@users.noreply.github.com> Date: Sat, 18 Jun 2022 03:38:01 -0500 Subject: [PATCH 3/4] Makes sci implant work --- code/__DEFINES/traits.dm | 1 + code/modules/mob/living/carbon/human/human_helpers.dm | 2 ++ code/modules/research/designs/medical_designs.dm | 11 +++++++++++ code/modules/research/techweb/all_nodes.dm | 2 +- code/modules/surgery/organs/augments_eyes.dm | 10 +++++++++- 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index f0105efad5ae..bcfdfb97bfc0 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -259,6 +259,7 @@ #define TRAIT_ANOREXIC "anorexic" #define TRAIT_SHIFTY_EYES "shifty_eyes" #define TRAIT_ANXIOUS "anxious" +#define TRAIT_SEE_REAGENTS "see_reagents" // common trait sources #define TRAIT_GENERIC "generic" diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index b329ff9fcfcd..4dbb0d58a909 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -178,6 +178,8 @@ return TRUE if(isclothing(wear_mask) && (wear_mask.clothing_flags & SCAN_REAGENTS)) return TRUE + if(HAS_TRAIT(src, TRAIT_SEE_REAGENTS)) + return TRUE /// When we're joining the game in [/mob/dead/new_player/proc/create_character], we increment our scar slot then store the slot in our mind datum. /mob/living/carbon/human/proc/increment_scar_slot() diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 349eacbf9eb1..70b06430b615 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -343,6 +343,17 @@ category = list("Implants", "Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL +/datum/design/cyberimp_science_analyzer + name = "Scientific Analyzer Implant" + desc = "These cybernetic eye implants will allow rapid identification of reagents. Wiggle eyes to control." + id = "ci-scihud" + build_type = PROTOLATHE | MECHFAB + construction_time = 50 + materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 600, /datum/material/gold = 600, /datum/material/plastic = 150) + build_path = /obj/item/organ/cyberimp/eyes/hud/science + category = list("Implants", "Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + /datum/design/cyberimp_xray name = "X-ray Eyes" desc = "These cybernetic eyes will give you X-ray vision. Blinking is futile." diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 5b2e00bd62af..00887016893e 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -547,7 +547,7 @@ display_name = "Cybernetic Implants" description = "Electronic implants that improve humans." prereq_ids = list("adv_biotech", "datatheory") - design_ids = list("ci-nutriment", "ci-breather", "ci-gloweyes", "ci-welding", "ci-medhud", "ci-sechud", "ci-diaghud") + design_ids = list("ci-nutriment", "ci-breather", "ci-gloweyes", "ci-welding", "ci-medhud", "ci-sechud", "ci-scihud", "ci-diaghud") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm index b5038bbd7316..037cbe19be40 100644 --- a/code/modules/surgery/organs/augments_eyes.dm +++ b/code/modules/surgery/organs/augments_eyes.dm @@ -48,4 +48,12 @@ /obj/item/organ/cyberimp/eyes/hud/science name = "Scientific Analyzer implant" - desc = "These cybernetic eye implants will allow rapid identification of reagents, and also allow scanning items for research value." + desc = "These cybernetic eye implants will allow rapid identification of reagents." + +/obj/item/organ/cyberimp/eyes/hud/science/Insert(var/mob/living/carbon/M, var/special = 0, drop_if_replaced = FALSE) + ..() + ADD_TRAIT(owner, TRAIT_SEE_REAGENTS, src) + +/obj/item/organ/cyberimp/eyes/hud/science/Remove(var/mob/living/carbon/M, var/special = 0) + REMOVE_TRAIT(owner, TRAIT_SEE_REAGENTS, src) + ..() From e4f8373e9abdf2ae1a76af5a02e77a605f807c9f Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx <1534478+GalacticRuler@users.noreply.github.com> Date: Sat, 18 Jun 2022 16:51:54 -0500 Subject: [PATCH 4/4] rename implant to reflect lack of research value scanner --- code/modules/research/designs/medical_designs.dm | 2 +- code/modules/surgery/organs/augments_eyes.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 70b06430b615..f1f338b611ce 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -344,7 +344,7 @@ departmental_flags = DEPARTMENTAL_FLAG_MEDICAL /datum/design/cyberimp_science_analyzer - name = "Scientific Analyzer Implant" + name = "Chemical Analyzer Implant" desc = "These cybernetic eye implants will allow rapid identification of reagents. Wiggle eyes to control." id = "ci-scihud" build_type = PROTOLATHE | MECHFAB diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm index 037cbe19be40..7115f32f923c 100644 --- a/code/modules/surgery/organs/augments_eyes.dm +++ b/code/modules/surgery/organs/augments_eyes.dm @@ -47,7 +47,7 @@ syndicate_implant = TRUE /obj/item/organ/cyberimp/eyes/hud/science - name = "Scientific Analyzer implant" + name = "Chemical Analyzer implant" desc = "These cybernetic eye implants will allow rapid identification of reagents." /obj/item/organ/cyberimp/eyes/hud/science/Insert(var/mob/living/carbon/M, var/special = 0, drop_if_replaced = FALSE)