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

multifaction crew monitor #8224

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Jan 24, 2025

About the pull request

Allows the crew monitor consoles to be multifaction. As of the moment it is not possible to have one crew monitor be multifaction and another not be, assuming they share the same base faction. Whichever is loaded first is how it will be done, though multifaction can be added mid-round with an easy var-edit

Explain why it's good for the game

Consistency, and makes more sense for WY which is still split between PMCs and non.

Testing Photographs and Procedure

image

Changelog

🆑
add: Added multifaction support to crew monitors
fix: cl not showing up on crew manifest
add: Giving Survivors/Other factions with IFF will let you track them.
/:cl:

@cmss13-ci cmss13-ci bot added the Feature Feature coder badge label Jan 24, 2025
cm13-github added a commit that referenced this pull request Jan 24, 2025
@cmss13-ci cmss13-ci bot added the Fix Fix one bug, make ten more label Jan 24, 2025
@Detective-Google
Copy link
Contributor

you might've already gotten these; seems like survsynths don't appear on the monitor (tried dropping and picking up the ID etc)-- though it's possible whatever the MP did with it fucked it up; I had USCM IFF, also fax responders show up on it. Was a hybrisa round so potentially to do with the presets on that map.

@fighterslam
Copy link

fighterslam commented Jan 26, 2025

I've noticed that Hunted In Preserve show up, specifically the Royal Marines Squad Lead, on the USCM monitor, aswell as the W-Y Communications Fax Responder. Not sure if any other unintended entities show up on the USCM monitor.

@realforest2001 realforest2001 marked this pull request as ready for review January 27, 2025 16:28
cm13-github added a commit that referenced this pull request Jan 27, 2025
cm13-github added a commit that referenced this pull request Jan 27, 2025
cm13-github added a commit that referenced this pull request Jan 27, 2025
cm13-github added a commit that referenced this pull request Jan 27, 2025
cm13-github added a commit that referenced this pull request Jan 27, 2025
cm13-github added a commit that referenced this pull request Jan 27, 2025
cm13-github added a commit that referenced this pull request Jan 28, 2025
Comment on lines 710 to +711
if(!GLOB.crewmonitor[faction])
GLOB.crewmonitor[faction] = new crewmonitor_type(faction)
GLOB.crewmonitor[faction] = new crewmonitor_type(faction, extra_factions)
Copy link
Member

Choose a reason for hiding this comment

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

doing this based on load order is just a bad idea, just either keep the crewmonitor datum on the monitor or key it based on the extra factions, eg

var/lookup_string = "[faction]-[json_encode(sort_list(extra_factions))"
if(!GLOB.crew_monitor[lookup_string]
	GLOB.crew_monitor[lookup_string] = new crew_monitor_type(faction, extra_factions)

@harryob harryob marked this pull request as draft January 28, 2025 19:25
cm13-github added a commit that referenced this pull request Jan 28, 2025
cm13-github added a commit that referenced this pull request Jan 28, 2025
cm13-github added a commit that referenced this pull request Jan 28, 2025
cm13-github added a commit that referenced this pull request Jan 28, 2025
cm13-github added a commit that referenced this pull request Jan 29, 2025
cm13-github added a commit that referenced this pull request Jan 29, 2025
cm13-github added a commit that referenced this pull request Jan 29, 2025
cm13-github added a commit that referenced this pull request Jan 29, 2025
cm13-github added a commit that referenced this pull request Jan 29, 2025
cm13-github added a commit that referenced this pull request Jan 29, 2025
cm13-github added a commit that referenced this pull request Jan 29, 2025
cm13-github added a commit that referenced this pull request Jan 30, 2025
cm13-github added a commit that referenced this pull request Jan 30, 2025
cm13-github added a commit that referenced this pull request Jan 30, 2025
cm13-github added a commit that referenced this pull request Jan 30, 2025
cm13-github added a commit that referenced this pull request Jan 30, 2025
cm13-github added a commit that referenced this pull request Jan 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Fix Fix one bug, make ten more
Projects
Status: Changes Requested
Development

Successfully merging this pull request may close these issues.

5 participants