Skip to content

Commit

Permalink
fixed admin menu and passes autoObserve but it seems really broken
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Aug 30, 2024
1 parent 4cda2f0 commit 0a35220
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 1 deletion.
2 changes: 2 additions & 0 deletions code/controllers/subsystem/points_of_interest.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions code/datums/elements/point_of_interest.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/dead/new_player/new_player.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions code/modules/mob/dead/observer/orbit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/Orbit/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const Orbit = (props, context) => {
</Flex.Item>
</Flex>
</Section>
<OrbitContent searchText={searchText} />
<OrbitContent searchText={searchText} autoObserve={autoObserve}/>
</Window.Content>
</Window>
);
Expand Down

0 comments on commit 0a35220

Please sign in to comment.