cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 13:18:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2756 from VOREStation/aro-borgexamine

Browse Source 
Remove HUD items from borg modules on all borgs
This commit is contained in:
Arokha Sieyes
2018-01-16 13:43:28 -05:00
committed by GitHub
parent 0a037f0fe0 d3d1ed971e
commit a724de287d
5 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/examine.dm
+2 -2
View File
@@ -496,9 +496,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
code/modules/mob/living/silicon/robot/robot_modules/event.dm
-1
View File
@@ -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)
code/modules/mob/living/silicon/robot/robot_modules/station.dm
-3
View File
@@ -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)
code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
-3
View File
@@ -76,7 +76,6 @@
src.modules += new /obj/item/device/dogborg/sleeper/K9(src) //Eat criminals. Bring them to the brig.
src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg(src) //They /are/ a security borg, after all.
src.modules += new /obj/item/weapon/dogborg/pounce(src) //Pounce
src.modules += new /obj/item/borg/sight/hud/sec(src) //Security hud to access crime records etc.
src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src) //Emag. Not a big problem.
R.icon = 'icons/mob/widerobot_vr.dmi'
R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
@@ -128,7 +127,6 @@
src.modules += new /obj/item/weapon/reagent_containers/glass/beaker(src)//For holding the chemicals when the chemist is nice
src.modules += new /obj/item/device/sleevemate(src) //Lets them scan people.
src.modules += new /obj/item/weapon/shockpaddles/robot/hound(src) //Paws of life
src.modules += new /obj/item/borg/sight/hud/med(src) //Medhud for accessing records and such.
src.emag = new /obj/item/weapon/dogborg/pounce(src) //Pounce
R.icon = 'icons/mob/widerobot_vr.dmi'
R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
@@ -154,7 +152,6 @@
src.modules += new /obj/item/device/dogborg/tongue(src)
src.modules += new /obj/item/taperoll/police(src)
src.modules += new /obj/item/device/dogborg/sleeper/K9(src)
src.modules += new /obj/item/borg/sight/hud/sec(src)
src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg/ertgun(src)
src.modules += new /obj/item/weapon/dogborg/swordtail(src)
src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src)
code/modules/mob/living/silicon/silicon.dm
+3 -2
View File
@@ -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."