cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 08:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+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.")
code/modules/mob/living/silicon/ai/ai.dm
-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
code/modules/mob/living/silicon/robot/robot.dm
+2 -5
View File
@@ -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)