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

Add Fugitives From Delta-V #538

Closed
wants to merge 24 commits into from

Conversation

Forzii
Copy link
Contributor

@Forzii Forzii commented Feb 7, 2025

Description

Attempting to port fugitive ghost role/midround antag from Delta-V. Currently in progress, just wanted to show publicly in case anyone wants to collaborate or help me test :)

Currently known bugs:
Ratking won't spawn via dedicated event (I think an updated events.yml entity definition is needed. May be best to remove the one in Nyanotrasen like the PR wanted and define a new one in a Floof events.yml since Delta-V has disabled it alltogether. No PR to pull since it's disabled, sadly. Definition requirements have changed with new antag refactor stuff. Works fine via mousemigration event, do we actually need this ratking-specific event? Is it for admin stuff?)
Listening outpost operatives don't get codewords/briefing/objectives/role (Behavior on master is they get no role or objective but they get a briefing and codewords)
Antags spawn the appearance of your selected character unless pre-generated (is that intentional maybe? master seems to have LP operatives just generic humans)
Objective briefing doesn't work for some antags, instead literally outputting the localization string (paradox anomaly, I forget what else)
Some playtime requirement error for ListeningPost (CharacterRequirement is abstract but could not find concrete type 'OverallPlaytimeRequirement')
Probably more send help.

Evaluating the inclusion of the following PRs:

DeltaV-Station/Delta-v#1413
DeltaV-Station/Delta-v#1457 (Cleanup and move localization stuff, requires 1411 I think)
DeltaV-Station/Delta-v#1666
DeltaV-Station/Delta-v#1797
DeltaV-Station/Delta-v#1817
DeltaV-Station/Delta-v#2363
DeltaV-Station/Delta-v#2374
DeltaV-Station/Delta-v#2383

Found some dependencies I also need to cherry-pick:
space-wizards/space-station-14#28310
space-wizards/space-station-14#28366
space-wizards/space-station-14#28485 (not strictly required but tests good)
space-wizards/space-station-14#28216 (precursor to 28217)
space-wizards/space-station-14#28217 (to get BaseAntagSpawner)
space-wizards/space-station-14#28208 (to get AntagLoadProfileRule)
DeltaV-Station/Delta-v#1206 (to get BaseMidRoundAntag)
DeltaV-Station/Delta-v#1369 (I think this is needed to fix some stuff, also gets us more in parity with other DV antag stuff)
space-wizards/space-station-14#28210 (to get RuleLoadedGridsEvent)
DeltaV-Station/Delta-v#1411 (Cleanup good right?? Also pre-req for 1457 I think)
space-wizards/space-station-14#28465 (to get IsWhitelistFail)

Also needed to re-add some of the changes from this PR due to the files getting moved/refactored:
#463
#325

This change likely effects (and therefore needs tested at minimum):
Loneop
Dragon
Ratking
Thief
Traitor?
LPO
Paradox Anomaly
Fugitive
Unknown shuttle events


TODO


Media

Example Media Embed


Changelog

🆑

  • add: Added fun :D
  • tweak: Tweaked fun
  • fix: Fixed fun!
  • remove: Removed fun :(

* add fugitive rule logic

* add fugitive role

* add fugitive event

* remove nyano spawner and make midround antag spawner work real

* fix announcement logic

* fix the funny bug i think

* fix crimes

* fix crime count

* 1 less min crime

* fix sex (real)

* thief bag unhardcode MaxSelectedSets

* :trollface:

* :trollface:

* add fugitive stash

* fix

* add misc stuff and fugitive stash

* m

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: UI Changes any XAML files Changes: YML Changes any yml files labels Feb 7, 2025
Tayrtahn and others added 7 commits February 7, 2025 11:19
GameTicking.Components got moved to Shared instead of Server
* add AntagObjectives from GenericAntag

* add AntagRandomObjectives that traitor and thief can use

* make ObjectivesSystem use initial character name which AntagSelection passes

* make thief and traitor use AntagRandomObjectives

* remove now unused locale

* make sleeper agents rule use baseTraitorRule

* restore dragon rule oop

* bandaid for genericantag

* real

* typo

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
* remove dragon system usage of GenericAntag

* add AntagRandomSpawn for making antags spawn at a random tile

* add AntagSpawner to make an antag spawner just spawn an entity

* add antag prototype for dragon since it never had one

* make dragon spawner a GhostRoleAntagSpawner, remove GenericAntag

* make dragon rule use AntagSelection and stuff

* remove dragon GenericAntag rule

* add back to spawn menu

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
But now there are load errors :(
@Floof-Station-Bot Floof-Station-Bot changed the title Add fugitives from Delta-V Add Fugitives From Delta-V Feb 9, 2025
deltanedas and others added 7 commits February 8, 2025 23:13
* move profile loading out of nukeops rule

* make BaseNukeopsRule and use AntagLoadProfileRule

* untroll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
I accidentally left an extra line in that roundstart.yml during the cherry-pick, and I needed a work-around for a nullable type issue.
* move paradox code around and update it

* make MidRoundAntagRule just give spawn locations

* update the yaml

* give anom and listening post raffles

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Null <[email protected]>
This was supposed to be deleted by the previous cherry-pick but wasn't for some reason.
Attempted to readd Fansana#463 in the new paradox anomaly code.
* rename pirate radio map to listening post, change spawner prototype

* refactor pirate radio spawn rule into DebrisSpawner and LoadFarGrid

* remove obsolete yml

* -m make listening post rule use new stuff and antag selection

* other changes

* fixes

* more

* fixy

* fix nan

* final fix

* what

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
@github-actions github-actions bot added the Changes: Map Changes any yml file in the Maps directories label Feb 10, 2025
Forzii and others added 9 commits February 9, 2025 21:19
Fixed Gameticking.Components discrepency
* remove unused terminator code

* remove genericantag usage, put everything on the real rule

* hide spawner from spawn menu

* remove terminator locale

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Added TerminatorComponent from Delta-V repository due to paradox anomaly reliance on it, and also replaced an unintentional instance of nospawn with the HideSpawnMenu category.
* Replace obsolete whitelist is valid with whitelist system

* Consistency

* Fix logic

* Bork

* I figured out how to get whitelists on the client lol

* test fail

* woops

* HELP ME FUNCTIONS

* Fix errors

* simplify

---------

Co-authored-by: plykiya <[email protected]>
Reverted the changes to the GatherableSystem due to incompatibility caused by a different PR I don't want to pull as part of this. Also commented out Paradox anomaly guaranteed psionics - it was causing errors likely due to a missing dependency. A problem for another day, perhaps.
Switched the listening outpost event to use the Floof "pirateradio" map and modified the map spawnpoint prototype  similar to Delta-V PR 1369
Disabled kill and friend objectives, made custom rules, and attempted to make custom role briefing.
* ensure everything has proper locale, remove more terminator stuff

* remove all unused terminator bits

* remove terminator objectives

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
@github-actions github-actions bot added the Changes: Sprite Changes any png or json in an RSI label Feb 13, 2025
Copy link
Contributor

RSI Diff Bot; head commit 1d4c83f merging into 27fb1d8
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Mobs/Species/Terminator/parts.rsi

State Old New Status
full Removed
head_f Removed
head_m Removed
l_arm Removed
l_foot Removed
l_hand Removed
l_leg Removed
r_arm Removed
r_foot Removed
r_hand Removed
r_leg Removed
skull_icon Removed
torso_f Removed
torso_m Removed

@Forzii
Copy link
Contributor Author

Forzii commented Feb 16, 2025

I don't really want to yet, but this will probably be closed either by me or one of the maintainers. Probably too many out-of-order upstream cherry-picks (I think there's 8 from wizden in there right now). I'm going to look into how I can help us get the upstream changes the planned way instead (whatever that entails, I dunno yet). Then I can come back to the Delta-V antag changes and additions (fugitive and syndicate recruiter specifically are my target) once we have the right upstream changes.

Edit: Also I don't really like how big the PR has gotten anyway. If I am going to do this stuff now (rather than whatever the "normal" catchup path is, I'd like to split a lot of this into different PRs.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Feb 18, 2025
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Forzii
Copy link
Contributor Author

Forzii commented Feb 21, 2025

I'm going to close this and perhaps make another attempt after the next upstream merge.

@Forzii Forzii closed this Feb 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files Status: Merge Conflict FIX YOUR PR AAAGH
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants