From 0a352202b050e0f248aced64f2e652645468e06e Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Fri, 30 Aug 2024 11:13:34 -0500 Subject: [PATCH] fixed admin menu and passes autoObserve but it seems really broken --- code/controllers/subsystem/points_of_interest.dm | 2 ++ code/datums/elements/point_of_interest.dm | 2 ++ code/modules/mob/dead/new_player/new_player.dm | 1 + code/modules/mob/dead/observer/orbit.dm | 3 +++ tgui/packages/tgui/interfaces/Orbit/index.tsx | 2 +- 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/points_of_interest.dm b/code/controllers/subsystem/points_of_interest.dm index b8e8b6397424..6de327bc8666 100644 --- a/code/controllers/subsystem/points_of_interest.dm +++ b/code/controllers/subsystem/points_of_interest.dm @@ -181,9 +181,11 @@ SUBSYSTEM_DEF(points_of_interest) if(poi_mob.client?.holder?.fakekey) return FALSE + /* // POI is a /mob/dead/new_player, players in the lobby are invalid as POIs. if(isnewplayer(poi_mob)) return FALSE + */ return TRUE diff --git a/code/datums/elements/point_of_interest.dm b/code/datums/elements/point_of_interest.dm index 3ab6c6296293..d64ee5466ace 100644 --- a/code/datums/elements/point_of_interest.dm +++ b/code/datums/elements/point_of_interest.dm @@ -6,11 +6,13 @@ if (!isatom(target)) return ELEMENT_INCOMPATIBLE + /* // New players are abstract mobs assigned to people who are still in the lobby screen. // As a result, they are not a valid POI and should never be a valid POI. If they // somehow get this element attached to them, there's something we need to debug. if(isnewplayer(target)) return ELEMENT_INCOMPATIBLE + */ SSpoints_of_interest.on_poi_element_added(target) return ..() diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 8fbf9c32a38e..2dbbd9d4b65b 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -35,6 +35,7 @@ . = ..() GLOB.new_player_list += src + SSpoints_of_interest.make_point_of_interest(src) /mob/dead/new_player/Destroy() GLOB.new_player_list -= src diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm index eb1c54df7934..051faa5bedac 100644 --- a/code/modules/mob/dead/observer/orbit.dm +++ b/code/modules/mob/dead/observer/orbit.dm @@ -73,6 +73,9 @@ var/mob/mob_poi = new_mob_pois[name] var/number_of_orbiters = length(mob_poi.get_all_orbiters()) + if(isnewplayer(mob_poi)) + continue + serialized["ref"] = REF(mob_poi) serialized["full_name"] = mob_poi.name serialized["job"] = mob_poi.job diff --git a/tgui/packages/tgui/interfaces/Orbit/index.tsx b/tgui/packages/tgui/interfaces/Orbit/index.tsx index 05ce4e2539f5..a233f1aa45c3 100644 --- a/tgui/packages/tgui/interfaces/Orbit/index.tsx +++ b/tgui/packages/tgui/interfaces/Orbit/index.tsx @@ -79,7 +79,7 @@ export const Orbit = (props, context) => { - + );