From 9a951e0f39e676f11460641ef34284efc9960684 Mon Sep 17 00:00:00 2001 From: The Lusty E <89947174+bruhlookatthisdood@users.noreply.github.com> Date: Fri, 25 Aug 2023 11:53:12 -0500 Subject: [PATCH] attempts a fix to the overlapping borg crew manifest hud (#2510) Co-authored-by: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com> --- code/_onclick/hud/_defines.dm | 2 +- code/_onclick/hud/robot.dm | 14 +++++++------- code/modules/mob/living/silicon/silicon.dm | 4 ++++ .../file_system/programs/borg_self_monitor.dm | 3 +++ icons/mob/screen_cyborg.dmi | Bin 19816 -> 17206 bytes .../code/modules/overmap/armour/nano_well.dm | 2 +- .../tgui/interfaces/NtosCyborgSelfMonitor.js | 9 +++++++++ 7 files changed, 25 insertions(+), 9 deletions(-) diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index 5845568efcd..92ab334b3db 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -58,7 +58,7 @@ #define ui_borg_store "CENTER+2:16,SOUTH:5" //borgs #define ui_borg_camera "CENTER+3:21,SOUTH:5" //borgs #define ui_borg_alerts "CENTER+4:21,SOUTH:5" //borgs -#define ui_borg_crew_manifest "CENTER+5:21,SOUTH:5" //borgs +//nsv removed #define ui_borg_crew_manifest "CENTER+5:21,SOUTH:5" //borgs #define ui_borg_language_menu "CENTER+4:21,SOUTH+1:5" //borgs #define ui_monkey_body "CENTER-6:12,SOUTH:5" //monkey diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 6b3076380ba..231278cfd59 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -141,11 +141,11 @@ using.hud = src static_inventory += using -//Manifest - using = new /atom/movable/screen/robot/crew_manifest() - using.screen_loc = ui_borg_crew_manifest - using.hud = src - static_inventory += using +//NSV removed //Manifest +// using = new /atom/movable/screen/robot/crew_manifest() +// using.screen_loc = ui_borg_crew_manifest +// using.hud = src +// static_inventory += using //Intent action_intent = new /atom/movable/screen/act_intent/robot() @@ -316,7 +316,7 @@ var/mob/living/silicon/robot/borgo = usr borgo.robot_alerts() -/atom/movable/screen/robot/crew_manifest +/* NSV removed /atom/movable/screen/robot/crew_manifest name = "Crew Manifest" icon = 'icons/mob/screen_ai.dmi' icon_state = "manifest" @@ -325,4 +325,4 @@ if(..()) return var/mob/living/silicon/robot/borgo = usr - borgo.ai_roster() + borgo.ai_roster() */ diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index a18e08498cf..623608335a2 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -471,6 +471,10 @@ add_sensors() to_chat(src, "Sensor overlay activated.") +/mob/living/silicon/proc/crew_manifest(mob/living/silicon) //nsv add manifest to borg computer + var/mob/living/silicon/borgo = usr + borgo.ai_roster() + /mob/living/silicon/proc/GetPhoto(mob/user) if (aicamera) return aicamera.selectpicture(user) diff --git a/code/modules/modular_computers/file_system/programs/borg_self_monitor.dm b/code/modules/modular_computers/file_system/programs/borg_self_monitor.dm index 81390787195..401a017e697 100644 --- a/code/modules/modular_computers/file_system/programs/borg_self_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/borg_self_monitor.dm @@ -116,6 +116,9 @@ if("toggleSensors") borgo.toggle_sensors() + if("crewmanifest") //nsv add manifest to borg computer + borgo.crew_manifest() + if("viewImage") if(borgo.connected_ai) borgo.connected_ai.aicamera?.viewpictures(usr) diff --git a/icons/mob/screen_cyborg.dmi b/icons/mob/screen_cyborg.dmi index 026ac9f5fa3efbb966c97f0f0fe2f1946c304631..f78b71d13dc3bb7a0f9eb59d2699941a0827a1b7 100644 GIT binary patch literal 17206 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 P=vWL-S3j3^P6T7 literal 19816 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 diff --git a/nsv13/code/modules/overmap/armour/nano_well.dm b/nsv13/code/modules/overmap/armour/nano_well.dm index bd56124344d..241f095de8e 100644 --- a/nsv13/code/modules/overmap/armour/nano_well.dm +++ b/nsv13/code/modules/overmap/armour/nano_well.dm @@ -354,7 +354,7 @@ Starting Materials /obj/machinery/armour_plating_nanorepair_well/ui_act(action, params, datum/tgui/ui) if(..()) return - if(!(in_range(src, usr) | IsAdminGhost(usr))) + if(!(in_range(src, usr) || IsAdminGhost(usr))) return var/adjust = text2num(params["adjust"]) if(action == "power_allocation") diff --git a/tgui/packages/tgui/interfaces/NtosCyborgSelfMonitor.js b/tgui/packages/tgui/interfaces/NtosCyborgSelfMonitor.js index 5c7bbbdf3d8..1752d9c14c5 100644 --- a/tgui/packages/tgui/interfaces/NtosCyborgSelfMonitor.js +++ b/tgui/packages/tgui/interfaces/NtosCyborgSelfMonitor.js @@ -176,6 +176,15 @@ export const NtosCyborgSelfMonitorContent = (props, context) => { onClick={() => act('toggleSensors')} /> + {/* NSV added manfiest to borg computer start */} + +