From 8a2a9ee3b03051a340ec3d80b17168ddbbc4e2f0 Mon Sep 17 00:00:00 2001 From: Markolie Date: Sun, 9 Oct 2016 18:20:20 +0200 Subject: [PATCH] Fixes multiple holograms being active at the same time, fixes AI's being unable to set wanted status. --- code/game/machinery/hologram.dm | 5 ++++- code/modules/mob/living/carbon/human/human.dm | 14 ++------------ code/modules/mob/living/silicon/ai/ai.dm | 5 ----- code/modules/mob/living/silicon/robot/robot.dm | 7 ++----- 4 files changed, 8 insertions(+), 23 deletions(-) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 8120bae4216..41952adf355 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -90,12 +90,15 @@ var/const/HOLOPAD_MODE = 0 user.eyeobj.setLoc(get_turf(src)) else if(!hologram)//If there is no hologram, possibly make one. activate_holo(user) - else if(master==user)//If there is a hologram, remove it. But only if the user is the master. Otherwise do nothing. + else if(master == user)//If there is a hologram, remove it. But only if the user is the master. Otherwise do nothing. clear_holo() return /obj/machinery/hologram/holopad/proc/activate_holo(mob/living/silicon/ai/user) if(!(stat & NOPOWER) && user.eyeobj.loc == src.loc)//If the projector has power and client eye is on it. + if(user.holo) + var/obj/machinery/hologram/holopad/current = user.holo + current.clear_holo() if(!hologram)//If there is not already a hologram. create_holo(user)//Create one. src.visible_message("A holographic image of [user] flicks to life right before your eyes!") diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 86232208e2e..ed48c229b89 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -854,12 +854,7 @@ modified = 1 spawn() - if(istype(usr,/mob/living/carbon/human)) - //var/mob/living/carbon/human/U = usr - sec_hud_set_security_status() - if(istype(usr,/mob/living/silicon/robot)) - //var/mob/living/silicon/robot/U = usr - sec_hud_set_security_status() + sec_hud_set_security_status() if(!modified) to_chat(usr, "\red Unable to locate a data core entry for this person.") @@ -984,12 +979,7 @@ PDA_Manifest.Cut() spawn() - if(istype(usr,/mob/living/carbon/human)) - //var/mob/living/carbon/human/U = usr - sec_hud_set_security_status() - if(istype(usr,/mob/living/silicon/robot)) - //var/mob/living/silicon/robot/U = usr - sec_hud_set_security_status() + sec_hud_set_security_status() if(!modified) to_chat(usr, "\red Unable to locate a data core entry for this person.") diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index c0800a2413d..95f9362684b 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -97,12 +97,7 @@ var/list/ai_verbs_default = list( var/obj/machinery/camera/portable/builtInCamera - //var/obj/item/borg/sight/hud/sec/sechud = null - //var/obj/item/borg/sight/hud/med/healthhud = null - var/arrivalmsg = "$name, $rank, has arrived on the station." - med_hud = DATA_HUD_MEDICAL_BASIC - sec_hud = DATA_HUD_SECURITY_BASIC /mob/living/silicon/ai/proc/add_ai_verbs() src.verbs |= ai_verbs_default diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index afae06678d2..7e771b2f372 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -78,16 +78,13 @@ var/list/robot_verbs_default = list( var/updating = 0 //portable camera camerachunk update - hud_possible = list(SPECIALROLE_HUD, DIAG_STAT_HUD, DIAG_HUD, DIAG_BATT_HUD,NATIONS_HUD) + hud_possible = list(SPECIALROLE_HUD, DIAG_STAT_HUD, DIAG_HUD, DIAG_BATT_HUD, NATIONS_HUD) var/magpulse = 0 var/ionpulse = 0 // Jetpack-like effect. var/ionpulse_on = 0 // Jetpack-like effect. var/datum/effect/system/ion_trail_follow/ion_trail // Ionpulse effect. - - var/obj/item/borg/sight/hud/sec/sechud = null - var/obj/item/borg/sight/hud/med/healthhud = null - + var/datum/action/item_action/toggle_research_scanner/scanner = null /mob/living/silicon/robot/New(loc,var/syndie = 0,var/unfinished = 0, var/alien = 0)