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.

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

Port tg statpanel #13546

Merged
merged 15 commits into from
Aug 15, 2023
Merged

Port tg statpanel #13546

merged 15 commits into from
Aug 15, 2023

Conversation

vvvv-vvvv
Copy link
Contributor

About The Pull Request

Port tg statpanel

Changelog

🆑
add: ported tg statpanel
/:cl:

@tgstation-server tgstation-server added Feature New interesting mechanics with new interesting bugs UI We make things worse, but rounder labels Jul 21, 2023
Copy link
Contributor

@ivanmixo ivanmixo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a fan of the "modern" stat panel personally but it is better code.

code/datums/components/connect_mob_behalf.dm Show resolved Hide resolved
code/modules/admin/admin_verbs.dm Show resolved Hide resolved
@vvvv-vvvv vvvv-vvvv force-pushed the tg-statpanel-port branch 4 times, most recently from 817eb31 to 661dedc Compare July 21, 2023 21:34
@lbnesquik
Copy link
Contributor

Can we get a look at it? What's so good about it? I don't play TG

@TiviPlus TiviPlus added the Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. label Jul 25, 2023
@github-actions github-actions bot added the Merge Conflict Pull request is in a conflicted state with base branch. label Jul 25, 2023
@tgstation-server tgstation-server removed Merge Conflict Pull request is in a conflicted state with base branch. Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. labels Jul 25, 2023
@Lumipharon Lumipharon added the Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. label Jul 25, 2023
comfyorange added a commit that referenced this pull request Jul 26, 2023
@Barnet2
Copy link
Contributor

Barnet2 commented Jul 26, 2023

Admin requests of a split of the admin tab back into admin and fun, alongside moving tickets
image

@vvvv-vvvv
Copy link
Contributor Author

Admin requests of a split of the admin tab back into admin and fun, alongside moving tickets image

It's a pref, but I'll change it to the older style by default

comfyorange added a commit that referenced this pull request Jul 26, 2023
comfyorange added a commit that referenced this pull request Jul 26, 2023
@Barnet2
Copy link
Contributor

Barnet2 commented Jul 26, 2023

Admin requests of a split of the admin tab back into admin and fun, alongside moving tickets image

It's a pref, but I'll change it to the older style by default

Would you mind moving the tickets back over? Also, a bolding bug
image

@ivanmixo
Copy link
Contributor

Mentors can see the MC tab apparently

@tgstation-server tgstation-server removed the Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. label Jul 26, 2023
@ivanmixo
Copy link
Contributor

Also game panel is missing

comfyorange added a commit that referenced this pull request Aug 9, 2023
@Lumipharon Lumipharon added the Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. label Aug 9, 2023
comfyorange added a commit that referenced this pull request Aug 9, 2023
@GravitronBlue
Copy link
Contributor

GravitronBlue commented Aug 9, 2023

Alt-click menu items can't be middle clicked with xeno abilities, which prevents being able to melt large stacks of items/flares on a single tile; same goes for trying to melt airlocks under blast doors.
Litterally fine now, but I swear it was broken earlier, guh.

comfyorange added a commit that referenced this pull request Aug 9, 2023
comfyorange added a commit that referenced this pull request Aug 9, 2023
Comment on lines 339 to 366
if(SSticker.mode)
var/rulerless_countdown = SSticker.mode.get_hivemind_collapse_countdown()
if(rulerless_countdown)
. += "Orphan hivemind collapse timer: [rulerless_countdown]"
if(GLOB.respawn_allowed)
status_value = (GLOB.key_to_time_of_role_death[key] + SSticker.mode?.respawn_time - world.time) * 0.1
if(status_value <= 0)
. += "Respawn timer: READY"
else
. += "Respawn timer: [(status_value / 60) % 60]:[add_leading(num2text(status_value % 60), 2, "0")]"
if(SSticker.mode?.flags_round_type & MODE_INFESTATION)
if(larva_position)
. += "Position in larva candidate queue: [larva_position]"
var/datum/job/xeno_job = SSjob.GetJobType(/datum/job/xenomorph)
var/stored_larva = xeno_job.total_positions - xeno_job.current_positions
if(stored_larva)
. += "Burrowed larva: [stored_larva]"
//game end timer for patrol and sensor capture
var/patrol_end_countdown = SSticker.mode?.game_end_countdown()
if(patrol_end_countdown)
. += "Round End timer: [patrol_end_countdown]"
//respawn wave timer
var/patrol_wave_countdown = SSticker.mode?.wave_countdown()
if(patrol_wave_countdown)
. += "Respawn wave timer: [patrol_wave_countdown]"
var/datum/game_mode/combat_patrol/sensor_capture/sensor_mode = SSticker.mode
if(issensorcapturegamemode(SSticker.mode))
. += "Activated Sensor Towers: [sensor_mode.sensors_activated]"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A lot of this stuff in get_status_tab_items() should all probably be in a game mode proc now that we are free from Stat().

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are you sure a bunch of istypes in a gamemode proc will be cleaner than this

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make it a gamemode proc so there is no istypes?

comfyorange added a commit that referenced this pull request Aug 11, 2023
comfyorange added a commit that referenced this pull request Aug 12, 2023
comfyorange added a commit that referenced this pull request Aug 12, 2023
comfyorange added a commit that referenced this pull request Aug 12, 2023
comfyorange added a commit that referenced this pull request Aug 12, 2023
comfyorange added a commit that referenced this pull request Aug 12, 2023
@lbnesquik
Copy link
Contributor

image

@Lumipharon
Copy link
Contributor

image

It would be good to fix this but uh, the current system is broken as fuck already, and just displays random icons half the time, of other items on that turf.

@tgstation-server tgstation-server removed the Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. label Aug 13, 2023
comfyorange added a commit that referenced this pull request Aug 13, 2023
@Lumipharon Lumipharon added the Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. label Aug 13, 2023
Comment on lines 121 to 123
var/datum/game_mode/combat_patrol/sensor_capture/sensor_mode = SSticker.mode
if(issensorcapturegamemode(SSticker.mode))
. += "Activated Sensor Towers: [sensor_mode.sensors_activated]"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you did it for observers but not living mobs?

@tgstation-server tgstation-server removed the Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. label Aug 14, 2023
@lbnesquik
Copy link
Contributor

image

It would be good to fix this but uh, the current system is broken as fuck already, and just displays random icons half the time, of other items on that turf.

This breaks the silicon tab tho, this one isn't broken currently.

Copy link
Contributor

@Lumipharon Lumipharon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also what is actually with the image issue? Because yeah its not ideal, I'd rather not merge something that is clearly broken.

Comment on lines +891 to +896
var/patrol_end_countdown = game_end_countdown()
if(patrol_end_countdown)
items += "Round End timer: [patrol_end_countdown]"
var/patrol_wave_countdown = wave_countdown()
if(patrol_wave_countdown)
items += "Respawn wave timer: [patrol_wave_countdown]"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be in the combat patrol child proc.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but it's a var on gamemode

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess its fine for now since the wording is generic.

But the countdowns are procs not vars. While the procs exist in the base gamemode, they don't do anything (but could be used in other gamemodes in the future of course) so this part of the stat should be where its actually used. i.e. combat patrol gamemode. But yeah, fine for now.

@vvvv-vvvv
Copy link
Contributor Author

also what is actually with the image issue? Because yeah its not ideal, I'd rather not merge something that is clearly broken.

i think its something related to byond not sending the images in time, its supposed to retry when that happens but it doesnt work at all. broken upstream too i think

@Lumipharon Lumipharon merged commit ccbd2d8 into tgstation:master Aug 15, 2023
6 checks passed
github-actions bot added a commit that referenced this pull request Aug 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature New interesting mechanics with new interesting bugs UI We make things worse, but rounder
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants