Fixes multiple holograms being active at the same time, fixes AI's being unable to set wanted status.

This commit is contained in:
Markolie
2016-10-09 18:20:20 +02:00
parent 55bb3e125b
commit 8a2a9ee3b0
4 changed files with 8 additions and 23 deletions
+4 -1
View File
@@ -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!")
+2 -12
View File
@@ -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.")
-5
View File
@@ -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
@@ -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)