cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes stuff I broke with my coding extravaganza.

Browse Source
This commit is contained in:
Ghommie
2019-12-07 05:11:29 +01:00
parent 5c43a68b71
commit 0a0094e80c
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/jobs/job_types/ai.dm
View File

@@ -36,7 +36,7 @@
qdel(lateJoinCore) qdel(lateJoinCore)
var/mob/living/silicon/ai/AI = H var/mob/living/silicon/ai/AI = H
AI.apply_pref_name("ai", M.client) //If this runtimes oh well jobcode is fucked. AI.apply_pref_name("ai", M.client) //If this runtimes oh well jobcode is fucked.
AI.set_core_display_icon(M.client) AI.set_core_display_icon(null, M.client)
//we may have been created after our borg //we may have been created after our borg
if(SSticker.current_state == GAME_STATE_SETTING_UP) if(SSticker.current_state == GAME_STATE_SETTING_UP)

18
code/modules/mob/living/silicon/ai/ai.dm
View File

@@ -176,13 +176,13 @@
fire_stacks = 0 fire_stacks = 0
. = ..() . = ..()
/mob/living/silicon/ai/proc/set_core_display_icon(client/C) /mob/living/silicon/ai/proc/set_core_display_icon(input, client/C)
if(client && !C) if(client && !C)
C = client C = client
if(!(C?.prefs?.preferred_ai_core_display)) if(!input && !C?.prefs?.preferred_ai_core_display)
icon_state = display_icon_override || initial(icon_state) icon_state = initial(icon_state)
else else
var/preferred_icon = display_icon_override || C.prefs.preferred_ai_core_display var/preferred_icon = input ? input : C.prefs.preferred_ai_core_display
icon_state = resolve_ai_icon(preferred_icon) icon_state = resolve_ai_icon(preferred_icon)
/mob/living/silicon/ai/verb/pick_icon() /mob/living/silicon/ai/verb/pick_icon()
@@ -202,8 +202,9 @@
if(!ai_core_icon || incapacitated()) if(!ai_core_icon || incapacitated())
return return
display_icon_override = ai_core_icon display_icon_override = ai_core_icon
set_core_display_icon() set_core_display_icon(ai_core_icon)
/mob/living/silicon/ai/Stat() /mob/living/silicon/ai/Stat()
..() ..()
@@ -600,7 +601,10 @@
if(incapacitated()) if(incapacitated())
return return
var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Thinking", "Friend Computer", "Dorfy", "Blue Glow", "Red Glow") var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Thinking", "Friend Computer", "Dorfy", "Blue Glow", "Red Glow")
emote_display = input("Please, select a status!", "AI Status", null, null) in ai_emotions var/n_emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
if(!n_emote)
return
emote_display = n_emote
for (var/each in GLOB.ai_status_displays) //change status of displays for (var/each in GLOB.ai_status_displays) //change status of displays
var/obj/machinery/status_display/ai/M = each var/obj/machinery/status_display/ai/M = each
M.emotion = emote_display M.emotion = emote_display
@@ -887,7 +891,7 @@
. = ..() . = ..()
if(.) //successfully ressuscitated from death if(.) //successfully ressuscitated from death
set_eyeobj_visible(TRUE) set_eyeobj_visible(TRUE)
set_core_display_icon() set_core_display_icon(display_icon_override)
/mob/living/silicon/ai/proc/malfhacked(obj/machinery/power/apc/apc) /mob/living/silicon/ai/proc/malfhacked(obj/machinery/power/apc/apc)
malfhack = null malfhack = null