cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Squashes silicon HUDs together (#35212)

Browse Source 
* Squashes silicon sensors together

* Fixes proc names

* Brings back individual sec/med huds for pai usage

* This fixes the pai

* Fixes toggle text
This commit is contained in:
Slignerd
2018-02-07 00:02:47 +01:00
committed by Emmett Gaines
parent 616444a14c
commit cb98e8d41b
3 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_onclick/hud/ai.dm
View File

@@ -162,7 +162,7 @@
if(..()) if(..())
return return
var/mob/living/silicon/S = usr var/mob/living/silicon/S = usr
S.sensor_mode() S.toggle_sensors()
/datum/hud/ai /datum/hud/ai

7
code/modules/mob/living/silicon/pai/software.dm
View File

@@ -235,7 +235,8 @@
if(href_list["toggle"]) if(href_list["toggle"])
secHUD = !secHUD secHUD = !secHUD
if(secHUD) if(secHUD)
add_sec_hud() var/datum/atom_hud/sec = GLOB.huds[sec_hud]
sec.add_hud_to(src)
else else
var/datum/atom_hud/sec = GLOB.huds[sec_hud] var/datum/atom_hud/sec = GLOB.huds[sec_hud]
sec.remove_hud_from(src) sec.remove_hud_from(src)
@@ -243,8 +244,8 @@
if(href_list["toggle"]) if(href_list["toggle"])
medHUD = !medHUD medHUD = !medHUD
if(medHUD) if(medHUD)
add_med_hud() var/datum/atom_hud/med = GLOB.huds[med_hud]
med.add_hud_to(src)
else else
var/datum/atom_hud/med = GLOB.huds[med_hud] var/datum/atom_hud/med = GLOB.huds[med_hud]
med.remove_hud_from(src) med.remove_hud_from(src)

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

@@ -30,6 +30,7 @@
var/ioncheck[1] var/ioncheck[1]
var/devillawcheck[5] var/devillawcheck[5]
var/sensors_on = 0
var/med_hud = DATA_HUD_MEDICAL_ADVANCED //Determines the med hud to use var/med_hud = DATA_HUD_MEDICAL_ADVANCED //Determines the med hud to use
var/sec_hud = DATA_HUD_SECURITY_ADVANCED //Determines the sec hud to use var/sec_hud = DATA_HUD_SECURITY_ADVANCED //Determines the sec hud to use
var/d_hud = DATA_HUD_DIAGNOSTIC_BASIC //Determines the diag hud to use var/d_hud = DATA_HUD_DIAGNOSTIC_BASIC //Determines the diag hud to use
@@ -328,7 +329,7 @@
/mob/living/silicon/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null) //Secbots won't hunt silicon units /mob/living/silicon/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null) //Secbots won't hunt silicon units
return -10 return -10
/mob/living/silicon/proc/remove_med_sec_hud() /mob/living/silicon/proc/remove_sensors()
var/datum/atom_hud/secsensor = GLOB.huds[sec_hud] var/datum/atom_hud/secsensor = GLOB.huds[sec_hud]
var/datum/atom_hud/medsensor = GLOB.huds[med_hud] var/datum/atom_hud/medsensor = GLOB.huds[med_hud]
var/datum/atom_hud/diagsensor = GLOB.huds[d_hud] var/datum/atom_hud/diagsensor = GLOB.huds[d_hud]
@@ -336,36 +337,24 @@
medsensor.remove_hud_from(src) medsensor.remove_hud_from(src)
diagsensor.remove_hud_from(src) diagsensor.remove_hud_from(src)
/mob/living/silicon/proc/add_sec_hud() /mob/living/silicon/proc/add_sensors()
var/datum/atom_hud/secsensor = GLOB.huds[sec_hud] var/datum/atom_hud/secsensor = GLOB.huds[sec_hud]
secsensor.add_hud_to(src)
/mob/living/silicon/proc/add_med_hud()
var/datum/atom_hud/medsensor = GLOB.huds[med_hud] var/datum/atom_hud/medsensor = GLOB.huds[med_hud]
medsensor.add_hud_to(src)
/mob/living/silicon/proc/add_diag_hud()
var/datum/atom_hud/diagsensor = GLOB.huds[d_hud] var/datum/atom_hud/diagsensor = GLOB.huds[d_hud]
secsensor.add_hud_to(src)
medsensor.add_hud_to(src)
diagsensor.add_hud_to(src) diagsensor.add_hud_to(src)
/mob/living/silicon/proc/sensor_mode() /mob/living/silicon/proc/toggle_sensors()
if(incapacitated()) if(incapacitated())
return return
var/sensor_type = input("Please select sensor type.", "Sensor Integration", null) in list("Security", "Medical","Diagnostic","Disable") sensors_on = !sensors_on
remove_med_sec_hud() if (!sensors_on)
switch(sensor_type) to_chat(src, "Sensor overlay deactivated.")
if ("Security") remove_sensors()
add_sec_hud() return
to_chat(src, "<span class='notice'>Security records overlay enabled.</span>") add_sensors()
if ("Medical") to_chat(src, "Sensor overlay activated.")
add_med_hud()
to_chat(src, "<span class='notice'>Life signs monitor overlay enabled.</span>")
if ("Diagnostic")
add_diag_hud()
to_chat(src, "<span class='notice'>Robotics diagnostic overlay enabled.</span>")
if ("Disable")
to_chat(src, "Sensor augmentations disabled.")
/mob/living/silicon/proc/GetPhoto() /mob/living/silicon/proc/GetPhoto()
if (aicamera) if (aicamera)