Conversation
* Initial * Applied Company * Save * Finale
* Initial * Lobby Display * Test run
* Initial * More
* Companies first implemented at Monolith-Station/Monolith@79ce141 This is to reorganize and elaborate upon them. * Moved Companies to Mono; they're a mono implementation. * Companies.yml change * The GNG Duran (duran) by floatingfeeling * Added EXP label to Duran for "Expedition" * Fixed ShipyardSystem.Consoles.cs import.
* Be rid of the NFSD colors for ships * I HATE THIS * WARRIORS PREPARE FOR COMBAT * FUCK YOU * THE GRAND RENAME * SHIPMASTER... THE BRUTE SHIPS OUTNUMBER US 3 TO 1..... * When we joined the Covenant, we took an oath! * HATE YOU * Linter fix * palletetete * THE INCREASE..
* Initial * Examine * Progress * Finale
* initial commit * ID cards and PDAs * DOORS AND ACCESS! * TIME TRACKERS! * Spawnpoints * Some shit * fix hopefully * wow * Dev map roles * he! * Whoops! * Hmm! * Yuh! * holding my blade * fix! * Hardsuit * NO MORE AIR TANKS * Whoops! * gadyuka * Hmmm.... * Yeah! * SWARM * Linter fix * Linter fix 2
github-actions
bot
added
S: Untriaged
size/XL
Map-Shuttle
Map-POI
Sprites
UI
C#
Docs
FTL
YML
DB Migration
and removed
size/XL
labels
|
chemdrobe localization messages seem fucked? Dont know how you managed that laughs |
|
Looks like the PR added localizations to the vendors with mono-specific voicelines for their factions, alongside the map checker edit. Might want to double check everything to make sure its all you want in this |
There was a problem hiding this comment.
Pull request overview
This PR introduces the first iteration of a factions system to the game, renaming the "NFSD" (New Frontier Sheriff's Department) to "TSFMC" (Trans-Solar Federation Marine Corps) and adding a new antagonist faction called "USSP" (Union of Soviet Socialist Planets). The changes include extensive updates to equipment names, descriptions, and lore references throughout the codebase, along with new ships, jobs, and access control systems for both factions.
- Renamed NFSD organization to TSFMC across all prototypes, localization, and descriptions
- Added USSP faction with ships, jobs, loadouts, and equipment
- Updated references from "Colsec" to "TSFMC" and from various NT/Nanotrasen references to TSF (Trans-Solar Federation)
Reviewed changes
Copilot reviewed 191 out of 467 changed files in this pull request and generated 6 comments.
Show a summary per file
| File | Description |
|---|---|
| Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/softsuits.yml | Added numerous departmental EVA suits with color variants |
| Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml | Renamed hardsuit variants from "Colsec" to "TSFMC", updated armor/speed values |
| Resources/Prototypes/_Mono/companies.yml | Added faction/company system including TSF, Rogue, USSP, and player factions |
| Resources/Prototypes/_Mono/ai_factions.yml | Defined TSFMC and USSP NPC factions with hostility relationships |
| Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/ | Added USSP job roles including Rifleman, Corporal, Medic, Sergeant, Commissar |
| Resources/Prototypes/_Mono/Entities/Clothing/ | Added USSP uniforms, headsets, hardsuits, and other equipment |
| Multiple paper form files | Updated all references from "Colsec/Sheriff" to "TSFMC/Colonel" |
| Multiple localization files | Updated station name and various text references for factions |
Files not reviewed (2)
- Content.Server.Database/Migrations/Postgres/20250416181247_AddCompanyToProfile.Designer.cs: Language not supported
- Content.Server.Database/Migrations/Sqlite/20250416034457_AddCompanyToProfile.Designer.cs: Language not supported
Comments suppressed due to low confidence (1)
Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml:1
- Corrected article 'An TSFMC' to 'A TSFMC' (TSFMC starts with a consonant sound).
#Mercenary Hardsuit
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
You can also share your feedback on Copilot code review for a chance to win a $100 gift card. Take the survey.
Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/softsuits.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/_Mono/Entities/Structures/Machines/ftldrive.yml
Outdated
Show resolved
Hide resolved
| @@ -0,0 +1,43 @@ | |||
| - type: job | |||
| id: USSPCommissar | |||
There was a problem hiding this comment.
Inconsistent spelling: 'Commissar' is spelled 'USSPCommissar' (with double 's') in the ID but typically the English spelling is 'Commissar' with one 's'. Verify if this is intentional or should be 'USSPCommissar' throughout.
There was a problem hiding this comment.
@copilot open a new pull request to apply changes based on this feedback
| @@ -1,26 +1,15 @@ | |||
| - type: vendingMachineInventory | |||
| - type: vendingMachineInventory | |||
There was a problem hiding this comment.
The file contains a BOM (Byte Order Mark) character at the beginning (). This can cause parsing issues. Remove the BOM character from the file.
| - type: vendingMachineInventory | |
| - type: vendingMachineInventory |
…uits.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…s/rifles.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…ve.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
|
@fenndragon I've opened a new pull request, #544, to work on those changes. Once the pull request is ready, I'll request review from you. |
[WIP] WIP Address feedback from review on Factions V1 PR
Revert "[WIP] WIP Address feedback from review on Factions V1 PR"
|
@BlueNexus I've opened a new pull request, #547, to work on those changes. Once the pull request is ready, I'll request review from you. |
About the PR
adds the first iteration of factions to the game, along with the framework to build upon in further updates.
Changelog
🆑