From 043608d807b5e10fd94c6719f3c7aa8c71781eca Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Mon, 15 Jan 2018 13:30:37 -0500 Subject: [PATCH 1/2] POLARIS: Remove the need for borgs to have HUD items in their module inventory --- code/modules/mob/living/carbon/human/examine.dm | 4 ++-- code/modules/mob/living/silicon/robot/robot_modules/event.dm | 1 - .../mob/living/silicon/robot/robot_modules/station.dm | 3 --- code/modules/mob/living/silicon/silicon.dm | 5 +++-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 81ea775ab9..08ea8bb2d9 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -475,9 +475,9 @@ var/mob/living/silicon/robot/R = M switch(hudtype) if("security") - return istype(R.module_state_1, /obj/item/borg/sight/hud/sec) || istype(R.module_state_2, /obj/item/borg/sight/hud/sec) || istype(R.module_state_3, /obj/item/borg/sight/hud/sec) + return R.hudmode == "Security" if("medical") - return istype(R.module_state_1, /obj/item/borg/sight/hud/med) || istype(R.module_state_2, /obj/item/borg/sight/hud/med) || istype(R.module_state_3, /obj/item/borg/sight/hud/med) + return R.hudmode == "Medical" else return 0 else diff --git a/code/modules/mob/living/silicon/robot/robot_modules/event.dm b/code/modules/mob/living/silicon/robot/robot_modules/event.dm index 8b2e80c448..cdc15210eb 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/event.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/event.dm @@ -16,7 +16,6 @@ src.modules += new /obj/item/borg/combat/shield(src) // Med - src.modules += new /obj/item/borg/sight/hud/med(src) src.modules += new /obj/item/device/healthanalyzer(src) src.modules += new /obj/item/weapon/reagent_containers/borghypo/lost(src) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index 7e51f4eef5..fbcd6375a6 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -211,7 +211,6 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/robot/medical/surgeon/New() ..() - src.modules += new /obj/item/borg/sight/hud/med(src) src.modules += new /obj/item/device/healthanalyzer(src) src.modules += new /obj/item/weapon/reagent_containers/borghypo/surgeon(src) src.modules += new /obj/item/weapon/surgical/scalpel/cyborg(src) @@ -273,7 +272,6 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/robot/medical/crisis/New() ..() - src.modules += new /obj/item/borg/sight/hud/med(src) src.modules += new /obj/item/device/healthanalyzer(src) src.modules += new /obj/item/device/reagent_scanner/adv(src) src.modules += new /obj/item/roller_holder(src) @@ -501,7 +499,6 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/robot/security/general/New() ..() - src.modules += new /obj/item/borg/sight/hud/sec(src) src.modules += new /obj/item/weapon/handcuffs/cyborg(src) src.modules += new /obj/item/weapon/melee/baton/robot(src) src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg(src) diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index f1554b59a7..689d27dce8 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -25,8 +25,7 @@ var/obj/item/weapon/card/id/idcard var/idcard_type = /obj/item/weapon/card/id/synthetic - #define SEC_HUD 1 //Security HUD mode - #define MED_HUD 2 //Medical HUD mode + var/hudmode = null /mob/living/silicon/New() silicon_mob_list |= src @@ -280,6 +279,8 @@ plane_holder.set_vis(VIS_CH_HEALTH,FALSE) to_chat(src,"Sensor augmentations disabled.") + hudmode = sensor_type //This is checked in examine.dm on humans, so they can see medical/security records depending on mode + /mob/living/silicon/verb/pose() set name = "Set Pose" set desc = "Sets a description which will be shown when someone examines you." From 1de268908429d8523ff29955c42b1f631cdce3a8 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Thu, 18 Jan 2018 13:16:04 -0500 Subject: [PATCH 2/2] Changelog for borg huds --- html/changelogs/Arokha - Borghuds.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/Arokha - Borghuds.yml diff --git a/html/changelogs/Arokha - Borghuds.yml b/html/changelogs/Arokha - Borghuds.yml new file mode 100644 index 0000000000..87bd63b6f7 --- /dev/null +++ b/html/changelogs/Arokha - Borghuds.yml @@ -0,0 +1,4 @@ +author: Arokha +delete-after: True +changes: + - tweak: "Remove borg hud items as they have normal huds as their sensor augs now, and can see records with them."