diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm index 3ea8133ad8b..08352fb5ce7 100644 --- a/code/__defines/mobs.dm +++ b/code/__defines/mobs.dm @@ -145,6 +145,7 @@ #define BP_AUG_TIMEPIECE "integrated timepiece" #define BP_AUG_TOOL "retractable combitool" #define BP_AUG_PEN "retractable combipen" +#define BP_AUG_CYBORG_ANALYZER "retractable cyborg analyzer" #define BP_AUG_LIGHTER "retractable lighter" #define BP_AUG_HEALTHSCAN "integrated health scanner" #define BP_AUG_GUSTATORIAL "integrated gustatorial centre" diff --git a/code/modules/client/preference_setup/loadout/loadout_augments.dm b/code/modules/client/preference_setup/loadout/loadout_augments.dm index 7f3e916b79f..c97426d95a4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_augments.dm +++ b/code/modules/client/preference_setup/loadout/loadout_augments.dm @@ -81,6 +81,20 @@ whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI) cost = 3 +/datum/gear/augment/analyzer + display_name = "retractable cyborg analyzer" + description = "An augment that allows the user to deploy a retractable cyborg analyzer." + path = /obj/item/organ/internal/augment/tool/cyborg_analyzer + allowed_roles = list("Machinist") + cost = 3 + +/datum/gear/augment/analyzer/New() + ..() + var/list/augs = list() + augs["retractable cyborg analyzer, right hand"] = /obj/item/organ/internal/augment/tool/cyborg_analyzer + augs["retractable cyborg analyzer, left hand"] = /obj/item/organ/internal/augment/tool/cyborg_analyzer/left + gear_tweaks += new /datum/gear_tweak/path(augs) + /datum/gear/augment/health_scanner display_name = "integrated health scanner" description = "An augment that allows the user scan their own health condition." diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm index bcec23bcfa1..7415ccd4cb0 100644 --- a/code/modules/mob/living/silicon/robot/analyzer.dm +++ b/code/modules/mob/living/silicon/robot/analyzer.dm @@ -1,5 +1,5 @@ // -//Robotic Component Analyser, basically a health analyser for robots +//Robotic Component Analyzer, basically a health analyzer for robots // /obj/item/device/robotanalyzer name = "cyborg analyzer" @@ -19,7 +19,6 @@ if((user.is_clumsy() || (DUMB in user.mutations)) && prob(50)) to_chat(user, SPAN_WARNING("You try to analyze the floor's vitals!")) visible_message(SPAN_WARNING("\The [user] has analyzed the floor's vitals!")) - to_chat(user, SPAN_NOTICE("Analyzing Results for The floor:")) to_chat(user, SPAN_NOTICE("Overall Status: Healthy")) to_chat(user, SPAN_NOTICE("Damage Specifics: [0]-[0]-[0]-[0]")) @@ -102,4 +101,19 @@ if(!organ_found) to_chat(user, SPAN_NOTICE("No prosthetics located.")) - add_fingerprint(user) \ No newline at end of file + add_fingerprint(user) + +/obj/item/device/robotanalyzer/augment + name = "retractable cyborg analyzer" + desc = "An scanner implanted directly into the hand, popping through the finger. This scanner can diagnose robotic injuries." + icon_state = "robotanalyzer" + item_state = "analyzer" + slot_flags = null + w_class = ITEMSIZE_HUGE + +/obj/item/device/robotanalyzer/augment/throw_at(atom/target, range, speed, mob/user) + user.drop_from_inventory(src) + +/obj/item/device/robotanalyzer/augment/dropped() + loc = null + qdel(src) \ No newline at end of file diff --git a/code/modules/organs/subtypes/augment.dm b/code/modules/organs/subtypes/augment.dm index c0e6b13ceab..9db25444c32 100644 --- a/code/modules/organs/subtypes/augment.dm +++ b/code/modules/organs/subtypes/augment.dm @@ -157,6 +157,19 @@ parent_organ = BP_L_HAND aug_slot = slot_l_hand +/obj/item/organ/internal/augment/tool/cyborg_analyzer + name = "retractable cyborg analyzer" + icon_state = "robotanalyzer" + action_button_name = "Deploy Analyzer" + action_button_icon = "augment-tool" + organ_tag = BP_AUG_CYBORG_ANALYZER + parent_organ = BP_R_HAND + augment_type = /obj/item/device/robotanalyzer/augment + +/obj/item/organ/internal/augment/tool/cyborg_analyzer/left + parent_organ = BP_L_HAND + aug_slot = slot_l_hand + /obj/item/organ/internal/augment/health_scanner name = "integrated health scanner" action_button_name = "Activate Health Scanner" diff --git a/html/changelogs/Ben10083 - CAnalAug.yml b/html/changelogs/Ben10083 - CAnalAug.yml new file mode 100644 index 00000000000..592a405c77b --- /dev/null +++ b/html/changelogs/Ben10083 - CAnalAug.yml @@ -0,0 +1,13 @@ +# Your name. +author: Ben10083 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a retractable cyborg analyzer useable by machinists." diff --git a/icons/obj/action_buttons/organs.dmi b/icons/obj/action_buttons/organs.dmi index 43b53321089..ea343bd9bd9 100644 Binary files a/icons/obj/action_buttons/organs.dmi and b/icons/obj/action_buttons/organs.dmi differ