From 64e7ac79d621c9e7b665f23f1e0b93a898d35331 Mon Sep 17 00:00:00 2001 From: Casey Date: Sat, 11 Jun 2022 21:33:33 -0400 Subject: [PATCH] Merge pull request #13071 from Very-Soft/pAIUI pAI hud revision --- code/_onclick/hud/_defines.dm | 1 + code/_onclick/hud/screen_objects_vr.dm | 4 ++++ .../modules/mob/living/silicon/pai/pai_hud.dm | 12 +++++++++++- icons/mob/pai_hud.dmi | Bin 3867 -> 4110 bytes 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index 14feaf1b5f..f1a7f22248 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -47,6 +47,7 @@ #define ui_construct_purge "EAST:00,CENTER-1:15" #define ui_construct_fire "EAST-1:16,CENTER+1:13" //above health, slightly to the left #define ui_construct_pull "EAST-1:28,SOUTH+1:10" //above the zone_sel icon +#define ui_pai_comms "EAST-1:28,SOUTH+1:5" //Lower right, persistant menu #define ui_dropbutton "EAST-4:22,SOUTH:5" diff --git a/code/_onclick/hud/screen_objects_vr.dm b/code/_onclick/hud/screen_objects_vr.dm index 4e9a25c7b5..526a316618 100644 --- a/code/_onclick/hud/screen_objects_vr.dm +++ b/code/_onclick/hud/screen_objects_vr.dm @@ -99,6 +99,10 @@ var/mob/living/silicon/pai/p = usr p.communicator.activate() + if("known languages") + if(ispAI(usr)) + var/mob/living/silicon/pai/p = usr + p.check_languages() else return 0 diff --git a/code/modules/mob/living/silicon/pai/pai_hud.dm b/code/modules/mob/living/silicon/pai/pai_hud.dm index 9438cc44bf..5137f6c593 100644 --- a/code/modules/mob/living/silicon/pai/pai_hud.dm +++ b/code/modules/mob/living/silicon/pai/pai_hud.dm @@ -122,7 +122,7 @@ using.name = "pda" using.icon = ui_style using.icon_state = "pda" - using.screen_loc = ui_acti + using.screen_loc = ui_pai_comms using.color = ui_color using.alpha = ui_alpha hud_elements |= using @@ -132,6 +132,16 @@ using.name = "communicator" using.icon = ui_style using.icon_state = "communicator" + using.screen_loc = ui_pai_comms + using.color = ui_color + using.alpha = ui_alpha + hud_elements |= using + + //Language button + using = new /obj/screen() + using.name = "known languages" + using.icon = ui_style + using.icon_state = "language" using.screen_loc = ui_acti using.color = ui_color using.alpha = ui_alpha diff --git a/icons/mob/pai_hud.dmi b/icons/mob/pai_hud.dmi index 97313c159bbc9d87451d79e6259fd50bef6a8bd0..c1be3ab314deb857b0277f44e79b11f2340bb384 100644 GIT binary patch literal 4110 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 Xk(qkxfF19j53s&|%c9=QJL!J_v1<%W literal 3867 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