Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Groundside Operations console now sorts FTLs correctly + shows ASL #5434

Merged
merged 2 commits into from
Jan 18, 2024
Merged

Groundside Operations console now sorts FTLs correctly + shows ASL #5434

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39b7b9b
Update groundside_operations.dm
TheGamerdk Jan 12, 2024
290d57e
Update groundside_operations.dm
TheGamerdk Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion code/game/machinery/computer/groundside_operations.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
dat += "No Squad selected!<BR>"
else
var/leader_text = ""
var/tl_text = ""
var/spec_text = ""
var/medic_text = ""
var/engi_text = ""
Expand Down Expand Up @@ -164,11 +165,15 @@
if(!H.key || !H.client)
SSD_count++
continue
if(H == current_squad.squad_leader && role != JOB_SQUAD_LEADER)
act_sl = "(ASL)"

var/marine_infos = "<tr><td><A href='?src=\ref[src];operation=use_cam;cam_target=\ref[H]'>[mob_name]</a></td><td>[role][act_sl]</td><td>[mob_state]</td><td>[area_name]</td></tr>"
switch(role)
if(JOB_SQUAD_LEADER)
leader_text += marine_infos
if(JOB_SQUAD_TEAM_LEADER)
tl_text += marine_infos
if(JOB_SQUAD_SPECIALIST)
spec_text += marine_infos
if(JOB_SQUAD_MEDIC)
Expand All @@ -187,7 +192,7 @@
dat += "<center><b>Search:</b> <input type='text' id='filter' value='' onkeyup='updateSearch();' style='width:300px;'></center>"
dat += "<table id='marine_list' border='2px' style='width: 100%; border-collapse: collapse;' align='center'><tr>"
dat += "<th>Name</th><th>Role</th><th>State</th><th>Location</th></tr>"
dat += leader_text + spec_text + medic_text + engi_text + smart_text + marine_text + misc_text
dat += leader_text + tl_text + spec_text + medic_text + engi_text + smart_text + marine_text + misc_text
dat += "</table>"
dat += "<br><hr>"
dat += "<A href='?src=\ref[src];operation=refresh'>Refresh</a><br>"
Expand Down
Loading