attempts a fix to the overlapping borg crew manifest hud (#2510)

Co-authored-by: Bokkiewokkie <[email protected]>
BeeStation · Aug 25, 2023 · 9a951e0 · 9a951e0
1 parent efec038
commit 9a951e0
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -176,6 +176,15 @@ export const NtosCyborgSelfMonitorContent = (props, context) => {
                         onClick={() => act('toggleSensors')}
                       />
                     </LabeledList.Item>
+                    {/* NSV added manfiest to borg computer start */}
+                    <LabeledList.Item
+                      label={'Crew Manifest'}>
+                      <Button
+                        content="Open"
+                        onClick={() => act('crewmanifest')}
+                      />
+                    </LabeledList.Item>
+                    {/* NSV added manfiest to borg computer end */}
                     <LabeledList.Item
                       label={'Stored Photos (' + printerPictures + ')'}>
                       <Button