cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4573 from VOREStation/pol-borghuds

Browse Source 
Removes HUD items from all borgs, makes records 'just work'
This commit is contained in:
Anewbe
2018-01-20 20:01:54 -06:00
committed by GitHub
parent e5b424e9a8 1de2689084
commit c79a75abce
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/carbon/human/examine.dm
View File

@@ -475,9 +475,9 @@
var/mob/living/silicon/robot/R = M var/mob/living/silicon/robot/R = M
switch(hudtype) switch(hudtype)
if("security") 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") 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 else
return 0 return 0
else else

1
code/modules/mob/living/silicon/robot/robot_modules/event.dm
View File

@@ -16,7 +16,6 @@
src.modules += new /obj/item/borg/combat/shield(src) src.modules += new /obj/item/borg/combat/shield(src)
// Med // Med
src.modules += new /obj/item/borg/sight/hud/med(src)
src.modules += new /obj/item/device/healthanalyzer(src) src.modules += new /obj/item/device/healthanalyzer(src)
src.modules += new /obj/item/weapon/reagent_containers/borghypo/lost(src) src.modules += new /obj/item/weapon/reagent_containers/borghypo/lost(src)

3
code/modules/mob/living/silicon/robot/robot_modules/station.dm
View File

@@ -211,7 +211,6 @@ var/global/list/robot_modules = list(
/obj/item/weapon/robot_module/robot/medical/surgeon/New() /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/device/healthanalyzer(src)
src.modules += new /obj/item/weapon/reagent_containers/borghypo/surgeon(src) src.modules += new /obj/item/weapon/reagent_containers/borghypo/surgeon(src)
src.modules += new /obj/item/weapon/surgical/scalpel/cyborg(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() /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/healthanalyzer(src)
src.modules += new /obj/item/device/reagent_scanner/adv(src) src.modules += new /obj/item/device/reagent_scanner/adv(src)
src.modules += new /obj/item/roller_holder(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() /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/handcuffs/cyborg(src)
src.modules += new /obj/item/weapon/melee/baton/robot(src) src.modules += new /obj/item/weapon/melee/baton/robot(src)
src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg(src) src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg(src)

5
code/modules/mob/living/silicon/silicon.dm
View File

@@ -25,8 +25,7 @@
var/obj/item/weapon/card/id/idcard var/obj/item/weapon/card/id/idcard
var/idcard_type = /obj/item/weapon/card/id/synthetic var/idcard_type = /obj/item/weapon/card/id/synthetic
#define SEC_HUD 1 //Security HUD mode var/hudmode = null
#define MED_HUD 2 //Medical HUD mode
/mob/living/silicon/New() /mob/living/silicon/New()
silicon_mob_list |= src silicon_mob_list |= src
@@ -280,6 +279,8 @@
plane_holder.set_vis(VIS_CH_HEALTH,FALSE) plane_holder.set_vis(VIS_CH_HEALTH,FALSE)
to_chat(src,"Sensor augmentations disabled.") 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() /mob/living/silicon/verb/pose()
set name = "Set Pose" set name = "Set Pose"
set desc = "Sets a description which will be shown when someone examines you." set desc = "Sets a description which will be shown when someone examines you."

4
html/changelogs/Arokha - Borghuds.yml Normal file
View File

@@ -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."