Accesses, Internal Names and IDs, Localization and Suffering Beyond Recognition. The PR, the Game.

Content.Server/_NF/CryoSleep/CryoSleepSystem.cs

@@ -420,24 +420,24 @@ public void CryoStoreBody(EntityUid bodyId, EntityUid cryopod)
         if (jobTitle != null)
         {
             // Check if job is one of the pirate jobs
-            isPirate = jobTitle.Equals(Loc.GetString("job-name-pirate"), StringComparison.OrdinalIgnoreCase) ||
-                       jobTitle.Equals(Loc.GetString("job-name-pirate-captain"), StringComparison.OrdinalIgnoreCase) ||
-                       jobTitle.Equals(Loc.GetString("job-name-pirate-first-mate"), StringComparison.OrdinalIgnoreCase);
+            isPirate = jobTitle.Equals(Loc.GetString("job-name-pdv-rahkshan"), StringComparison.OrdinalIgnoreCase) ||
+                       jobTitle.Equals(Loc.GetString("job-name-pdv-vizier"), StringComparison.OrdinalIgnoreCase) ||
+                       jobTitle.Equals(Loc.GetString("job-name-pdv-denasvar"), StringComparison.OrdinalIgnoreCase) ||
+                       jobTitle.Equals(Loc.GetString("job-name-pdv-infiltrator"), StringComparison.OrdinalIgnoreCase) ||
+                       jobTitle.Equals(Loc.GetString("job-name-pdv-asvaran"), StringComparison.OrdinalIgnoreCase);
         }
 
         // Check if character is TSF, and if so, use TSF radio instead of Common
         bool isTSF = false;
         if (jobTitle != null)
         {
-            isTSF = jobTitle.Equals(Loc.GetString("job-name-bailiff"), StringComparison.OrdinalIgnoreCase) ||
-                    jobTitle.Equals(Loc.GetString("job-name-brigmedic"), StringComparison.OrdinalIgnoreCase) ||
-                    jobTitle.Equals(Loc.GetString("job-name-cadet-nf"), StringComparison.OrdinalIgnoreCase) ||
-                    jobTitle.Equals(Loc.GetString("job-name-deputy"), StringComparison.OrdinalIgnoreCase) ||
-                    jobTitle.Equals(Loc.GetString("job-name-nf-detective"), StringComparison.OrdinalIgnoreCase) ||
-                    jobTitle.Equals(Loc.GetString("job-name-sheriff"), StringComparison.OrdinalIgnoreCase) ||
-                    jobTitle.Equals(Loc.GetString("job-name-stc"), StringComparison.OrdinalIgnoreCase) ||
-                    jobTitle.Equals(Loc.GetString("job-name-sr"), StringComparison.OrdinalIgnoreCase) ||
-                    jobTitle.Equals(Loc.GetString("job-name-pal"), StringComparison.OrdinalIgnoreCase);
+            isTSF = jobTitle.Equals(Loc.GetString("job-name-tsf-officer"), StringComparison.OrdinalIgnoreCase) ||
+                    jobTitle.Equals(Loc.GetString("job-name-tsf-corpsman"), StringComparison.OrdinalIgnoreCase) ||
+                    jobTitle.Equals(Loc.GetString("job-name-tsf-recruit"), StringComparison.OrdinalIgnoreCase) ||
+                    jobTitle.Equals(Loc.GetString("job-name-tsf-marine"), StringComparison.OrdinalIgnoreCase) ||
+                    jobTitle.Equals(Loc.GetString("job-name-tsf-engineer"), StringComparison.OrdinalIgnoreCase) ||
+                    jobTitle.Equals(Loc.GetString("job-name-tsf-teamleader"), StringComparison.OrdinalIgnoreCase) ||
+                    jobTitle.Equals(Loc.GetString("job-name-tsf-commandingofficer"), StringComparison.OrdinalIgnoreCase);
         }
 
         // Send radio message on appropriate channel

Content.Server/_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs

@@ -391,8 +391,8 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp
         }
 
         SendPurchaseMessage(shipyardConsoleUid, player, name, component.ShipyardChannel, secret: false);
-        if (component.SecretShipyardChannel is { } secretChannel)
-            SendPurchaseMessage(shipyardConsoleUid, player, name, secretChannel, secret: true);
+        ///if (component.SecretShipyardChannel is { } secretChannel) #Mono, why the hell do we have secret shipyard channels?????
+        ///    SendPurchaseMessage(shipyardConsoleUid, player, name, secretChannel, secret: true);
 
         var vesselStore = EnsureComp<VesselComponent>(shuttleUid);
         vesselStore.VesselId = vessel.ID;
@@ -560,8 +560,8 @@ public void OnSellMessage(EntityUid uid, ShipyardConsoleComponent component, Shi
 
         var name = GetFullName(deed);
         SendSellMessage(uid, deed.ShuttleOwner!, name, component.ShipyardChannel, player, secret: false);
-        if (component.SecretShipyardChannel is { } secretChannel)
-            SendSellMessage(uid, deed.ShuttleOwner!, name, secretChannel, player, secret: true);
+        //if (component.SecretShipyardChannel is { } secretChannel) #Mono, WHY IS THERE A SECRET SHIPYARD CHANNEL WE NEVER USE THOSE
+        //    SendSellMessage(uid, deed.ShuttleOwner!, name, secretChannel, player, secret: true);
 
         EntityUid? refreshId = targetId;
 

Content.Shared/Access/Components/IdCardConsoleComponent.cs

@@ -83,11 +83,12 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
     //"USSPCommand", // Mono
     //"Theatre",
     "Frontier", // Frontier //TSF Base access
-    "Sergeant", // Frontier //TSF FTL access
-    "Bailiff", // Frontier //TSF Command access
+    "TsfGeneral", // Mono //General Marine access, everyone has it in the corps
+    "TsfOfficer", // Mono //TSF Command access
+    "TsfFtl", // Mono //teamleader level access
     "TsfmcEngineering", // Mono, TSF Engineering access
-    "HeadOfSecurity", // TSF Colonel
-    "Pirate", //Frontier //PDV base access
+    "TsfCommander", // TSF Colonel
+    "PDVGeneral", //Frontier //PDV base access
     "PDVCommand", //Mono, PDV leadership (Denasvar, Asvaran, Vizier)
     "GrandVizier",//Mono, PDV Vizier
     };

Content.Shared/_NF/Shipyard/Components/SharedShipyardConsoleComponent.cs

@@ -35,8 +35,9 @@ public sealed partial class ShipyardConsoleComponent : Component
     /// A second comms channel that announces the ship purchase, with some information redacted.
     /// Currently used for black market and syndicate shipyards to alert the NFSD.
     /// </summary>
-    [DataField("secretShipyardChannel")]
-    public ProtoId<RadioChannelPrototype>? SecretShipyardChannel = null;
+    /// Mono edit WHY EVEN IS THIS A THING THERE IS NO REASON NFSD IS DEAD AND WE KILLED IT
+    //DataField("secretShipyardChannel")]
+    //public ProtoId<RadioChannelPrototype>? SecretShipyardChannel = null;
 
     /// <summary>
     /// If non-empty, specifies the new job title that should be given to the owner of the ship.

Resources/Locale/en-US/_Mono/job/department-desc.ftl

@@ -1,3 +1,9 @@
 department-PMC-description = Combat focused contractors, who have less restrictions on gear they can carry.
 department-Medical-description = Emergency medical responders, deployed across space for rapid aid and rescue.
 department-Viper-description = Elite contractors belonging to a company of syndicate origins.
+department-Pdv-description = Keep the claim the Sultan has places centuries ago on this sector, vanquish all enemies of the Dynasty.
+department-NFCivilian-description = Team up with a crew and go out on adventures!
+department-NFCommand-description = Manage the sector, keep things running efficiently.
+department-NFCentralCommand-description = Get the sector and your forces under control, keep command on its toes.
+department-Tsf-description = Expand the influence of Sol across the sector, crush any enemy resistance. Sol Invictus.
+department-NF-description = Maintain a modicum of oder among the few civilized stations of the Colossus Sector

Resources/Locale/en-US/_Mono/job/department.ftl

@@ -4,3 +4,7 @@ department-UnionOfSovietSocialistPlanets = Union of Soviet Socialist Planets
 department-UnionOfSovietSocialistPlanets-description = Serve the glorious Union in space against TSFMC and PDV forces.
 department-Medical = Medical Dispatch
 department-Viper = Viper Group
+department-Pdv = Phaethon Dynasty Imperial Vanguard
+department-Command = Central Command
+department-Frontier = Colossus Frontier Colonization
+department-Tsf = TSF Navy and Marine Detachment

Resources/Locale/en-US/_Mono/job/job-description.ftl

@@ -9,9 +9,22 @@ job-description-md-medic = Traverse the space to provide life-saving care aboard
 # MARK: TSF
 job-description-tsf-engineer = Maintain the integrity of the flagship, get laughed at for not being a real soldier.
 job-description-tsf-borg = Half-human, Half-machine. Follow your laws, serve the TSF, and beg engineers for upgrades.
+job-description-tsf-marine = Hunt down Imperials and enemies of the TSF, follow orders from your superiors. Enforce the Will of Sol.
+job-description-tsf-officer = Command your assigned force if you have one, follow orders from the Commanding Officers, lead in case they are not present. Crush any resistance you may encounter.
+job-description-tsf-corpsman = Fight in the rear of the force, for the lives of your comrades! You are the first and last hope of your squad, allegedly. Hippocrates blesses you.
+job-description-tsf-marsoc = An elite member of the TSF's MARSOC. Rarely deployed to Colossus, if they're here, they have a good reason to.
+job-description-tsf-teamleader = Lead your squad, be the bridge between Command and the marines that are under your orders, follow officer orders and advice.
+job-description-tsf-commandingofficer = Manage your assigned TSF force, be it navy or marine. Drive the Dynasty's forces out of the Colossus sector, by any means if necessary, this deployment is of importance to establish a beachhead in the Colossus sector.
+job-description-tsf-recruit = Hunt down Phaeton imperials and protect the FOB. Listen to your supervisors and feel free to ask them for any help.
 
 # MARK: PDV
 job-description-pdv-borg = Half-human, Half-machine. Follow your laws, serve the PDV, and beg dynasty troops for upgrades.
+job-description-pdv-infiltrator = You are an infiltration expert of the Imperial Vanguard, deceive and cause chaos from behind the frontline. You answer to the Denasvar and above.
+job-description-pdv-rahkshan = You are a member of an imperial battalion against the TSF expansion into the Colossus sector.
+job-description-pdv-asvaran = Handle special orders from the Grand Vizier and watch over those under you.
+job-description-pdv-grandvizier = You are the leader of an imperial battalion against the Federation scum that which tries to lay claim on the holy space of the Sultan.
+job-description-pdv-denasvar = You are a more experienced member of the Vanguard. Lead your peers to victory.
+job-description-pdv-tarkhan = An elite member of the PDV. Rarely deployed to Colossus.
 
 # MARK: Viper Group
 job-description-vg-infanteer = Follow the orders from above. Complete contracts. Get paid.

Resources/Locale/en-US/_Mono/job/job-names.ftl

@@ -8,15 +8,48 @@ job-supervisors-ussp-sergeant = the Serzhants
 
 # MARK: MD
 job-name-md-medic = Emergency Responder
+job-name-doc = Director of Care
 
 # MARK: TSF
 job-name-tsf-engineer = TSFMC Engineer
 job-name-tsf-borg = TSFMC Cyborg
+job-name-tsf-marine = TSFMC Marine
+job-name-tsf-officer = TSF Officer
+job-name-tsf-corpsman = TSF Corpsman
+job-name-tsf-recruit = TSFMC Recruit
+job-name-tsf-commandingofficer = TSF Commanding Officer
+job-name-tsf-marsoc = TSFMC MARSOC Operative
+job-name-tsf-teamleader = TSFMC Fireteam Leader
 
 # MARK: PDV
 job-name-pdv-borg = PDV Cyborg
+job-name-pdv-infiltrator = PDV Spasaka
+job-name-pdv-vizier = PDV Grand Vizier
+job-name-pdv-asvaran = PDV Asvaran
+job-name-pdv-rahkshan = PDV Rahkshan
+job-name-pdv-denasvar = PDV Denasvar
+job-name-pdv-tarkhan = PDV Tarkhan
 
 # MARK: Viper Group
 job-name-vg-infanteer = VG Infanteer
 job-name-vg-lieutenant = VG Lieutenant
 job-name-vg-commander = VG Commander
+
+# MARK: Colossus Central
+job-name-security-guard = Judge
+job-name-stc = Station Traffic Controller
+job-name-sr = Overseer
+
+#Role timers
+JobPDVInfiltrator = PDV Spasaka
+JobPDVRahkshan = PDV Rahkshan
+JobPDVGrandVizier = PDV Grand Vizier
+JobPDVAsvaran = PDV Asvaran
+JobPDVDenasvar = PDV Denasvar
+JobTsfCommander = TSF Commanding Officer
+JobTsfTeamleader = TSFMC Team leader
+JobTsfOfficer = TSF Officer
+JobTsfCorpsman = TSF Corpsman
+JobTsfMarine = TSFMC Marine
+JobTsfRecruit = TSFMC Recruit
+JobTsfEngineer = TSF Engineer

Resources/Locale/en-US/_Mono/job/job-supervisors.ftl

@@ -2,3 +2,14 @@ job-supervisors-doc = Director of Care
 job-supervisors-vg-infanteer = the lieutenant
 job-supervisors-vg-lieutenant = the commander
 job-supervisors-vg-commander = Sidewinder-01
+job-supervisors-sr = the Overseer
+job-supervisors-tsf-commandingofficer = TSF High Command
+job-supervisors-tsf-officer = the Commanding Officer
+job-supervisors-tsf-teamleader = the Officers and Commander
+job-supervisors-tsf-recruit = all TSFMC and TSFN personnel
+job-supervisors-tsf = Fireteam Leaders, and all higher ranking officers
+job-supervisors-pdv = the PDV Denasvar and higher ranked personnel
+job-supervisors-pdv-denasvar = the Asvaran and Grand Vizier
+job-supervisors-pdv-asvaran = the Grand Vizier
+job-supervisors-nobody = nobody
+job-supervisors-ws = Winter Solstice

Resources/Locale/en-US/_Mono/prototypes/access/accesses.ftl

@@ -5,10 +5,15 @@ id-card-access-level-ussp-debug = MAKE A ISSUE ON THE GITHUB IF YOU SEE THIS
 
 id-card-access-level-voucher = IGNORE, VOUCHER SHITCODE
 
+id-card-access-level-pdv = PDV
 id-card-access-level-pdv-vizier = PDV Grand Vizier
 id-card-access-level-pdv-command = PDV Command
 
-id-card-access-level-tsf-engineer = TSF Engineering
-
 id-card-access-level-vg = Viper Group
 id-card-access-level-vg-high = Viper Group Command
+
+id-card-access-level-tsf = TSF
+id-card-access-level-tsf-ftl = TSFMC Fireteam Leader
+id-card-access-level-tsf-officer = TSF Command
+id-card-access-level-tsf-commander = TSF Commanding Officer
+id-card-access-level-tsf-engineer = TSF Engineering

Resources/Locale/en-US/_Mono/store/currency.ftl

@@ -0,0 +1,2 @@
+store-currency-display-tsf-telecrystal = FMC
+store-currency-display-pdv-telecrystal = DC