Resolved merge conflicts and updated from upstream

Corvax-Frontier · Apr 22, 2024 · 1f74fc8 · 1f74fc8
2 parents b2e4f0a + 720a91f
commit 1f74fc8
Show file tree

Hide file tree

Showing 296 changed files with 9,498 additions and 2,593 deletions.
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -28,39 +28,39 @@ public sealed partial class IdCardConsoleComponent : Component
     public List<ProtoId<AccessLevelPrototype>> AccessLevels = new()
     {
         "Armory",
-        "Atmospherics",
-        "Bar",
+        //"Atmospherics",
+        //"Bar",
         "Brig",
         "Detective",
         "Captain",
-        "Cargo",
-        "Chapel",
-        "Chemistry",
-        "ChiefEngineer",
-        "ChiefMedicalOfficer",
+        //"Cargo",
+        //"Chapel",
+        //"Chemistry",
+        //"ChiefEngineer",
+        //"ChiefMedicalOfficer",
         "Command",
-        "Cryogenics",
-        "Engineering",
+        //"Cryogenics",
+        //"Engineering",
         "External",
         "Frontier", // Frontier
         "HeadOfPersonnel",
         "HeadOfSecurity",
-        "Hydroponics",
+        //"Hydroponics",
         "Janitor",
-        "Kitchen",
+        //"Kitchen",
         "Lawyer",
         "Mail", // Frontier
         "Maintenance",
         "Medical",
         "Mercenary", // Frontier
         "Pilot", // Frontier
-        "Quartermaster",
-        "Research",
-        "ResearchDirector",
-        "Salvage",
+        //"Quartermaster",
+        //"Research",
+        //"ResearchDirector",
+        //"Salvage",
         "Security",
         "Service",
-        "Theatre",
+        //"Theatre",
     };
 
     [Serializable, NetSerializable]

diff --git a/Content.Shared/CriminalRecords/Components/CriminalRecordsConsoleComponent.cs b/Content.Shared/CriminalRecords/Components/CriminalRecordsConsoleComponent.cs
@@ -35,7 +35,7 @@ public sealed partial class CriminalRecordsConsoleComponent : Component
     /// Channel to send messages to when someone's status gets changed.
     /// </summary>
     [DataField]
-    public ProtoId<RadioChannelPrototype> SecurityChannel = "Security";
+    public ProtoId<RadioChannelPrototype> SecurityChannel = "Nfsd";
 
     /// <summary>
     /// Max length of arrest and crime history strings.

diff --git a/Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs b/Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs
@@ -25,7 +25,7 @@ public sealed partial class ShipyardConsoleComponent : Component
     public string ShipyardChannel = "Traffic";
 
     [DataField("securityShipyardChannel")]
-    public string SecurityShipyardChannel = "NFSD";
+    public string SecurityShipyardChannel = "Nfsd";
 
     [DataField("blackMarketShipyardChannel")]
     public string BlackMarketShipyardChannel = "Syndicate";

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -4079,3 +4079,53 @@ Entries:
       message: NFSD now has access to breaching charges.
   id: 4918
   time: '2024-04-18T21:59:45.0000000+00:00'
+- author: Kesiath
+  changes:
+    - type: Add
+      message: Added NFSD combat and command hardsuits.
+  id: 4919
+  time: '2024-04-19T17:57:57.0000000+00:00'
+- author: Salvantrix
+  changes:
+    - type: Remove
+      message: Removed NFSD ships awaiting rework. (Interceptor and Whiskey.)
+  id: 4920
+  time: '2024-04-19T22:32:58.0000000+00:00'
+- author: Kesiath
+  changes:
+    - type: Tweak
+      message: Changed the Hospitaller and Templar to include NFSD changes.
+  id: 4921
+  time: '2024-04-20T01:22:08.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: '"Night Of The Post Goblin" (painting) has come.'
+  id: 4922
+  time: '2024-04-21T13:59:35.0000000+00:00'
+- author: MoistBiscuits
+  changes:
+    - type: Add
+      message: Added Vagabond medium freighter
+  id: 4923
+  time: '2024-04-21T22:14:31.0000000+00:00'
+- author: Kesiath
+  changes:
+    - type: Tweak
+      message: Changed descriptions of guns to be clearly contraband or not.
+  id: 4924
+  time: '2024-04-22T00:06:47.0000000+00:00'
+- author: Kesiath
+  changes:
+    - type: Add
+      message: >-
+        Added the N2524 Pattern Repeater, a lever action rifle, to the
+        liberation station.
+  id: 4925
+  time: '2024-04-22T00:16:43.0000000+00:00'
+- author: Tych0theSynth
+  changes:
+    - type: Fix
+      message: Blood cultists no longer use numerals instead of punctuation
+  id: 4926
+  time: '2024-04-22T10:12:32.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/advertisements/mobchatter/bloodculthumanoidmob.ftl b/Resources/Locale/en-US/_NF/advertisements/mobchatter/bloodculthumanoidmob.ftl
@@ -15,6 +15,6 @@ advertisement-bloodcultisthumanoid-14 = There will be no mercy, unbeliever.
 advertisement-bloodcultisthumanoid-15 = Hey, nice jacket!
 advertisement-bloodcultisthumanoid-16 = Death to the followers of False Gods!
 advertisement-bloodcultisthumanoid-17 = Yes-yes, blood. Need more blood. More, yes.
-advertisement-bloodcultisthumanoid-18 = Void take you1
+advertisement-bloodcultisthumanoid-18 = Void take you!
 advertisement-bloodcultisthumanoid-19 = *hums*
 advertisement-bloodcultisthumanoid-20 = I will make a flute out of your collarbone!
diff --git a/Resources/Locale/en-US/_NF/job/job-supervisors.ftl b/Resources/Locale/en-US/_NF/job/job-supervisors.ftl
@@ -0,0 +1,7 @@
+job-supervisors-sr = the station representative
+job-supervisors-sheriff = the sheriff
+job-supervisors-bailiff = the bailiff
+job-supervisors-sergeant = the sergeant
+job-supervisors-cadet = all higher ranking nfsd personnel
+job-supervisors-prisoner = all nfsd personnel
+job-supervisors-nfsd = deputies, the bailiff, and the sheriff
diff --git a/Resources/Locale/en-US/job/job-supervisors.ftl b/Resources/Locale/en-US/job/job-supervisors.ftl
@@ -1,15 +1,15 @@
 job-supervisors-centcom = CentCom official
 job-supervisors-captain = the captain
-job-supervisors-hop = the station representative
-job-supervisors-hos = the sheriff
+job-supervisors-hop = the head of personnel
+job-supervisors-hos = the head of security
 job-supervisors-ce = the chief engineer
 job-supervisors-cmo = the chief medical officer
 job-supervisors-rd = the research director
 job-supervisors-qm = the quartermaster
 job-supervisors-service = chefs, botanists, the bartender, and the head of personnel
-job-supervisors-engineering = station engineers, atmospheric technicians, the senior engineer, and the chief engineer
-job-supervisors-medicine = medical doctors, chemists, the senior physician, and the chief medical officer
-job-supervisors-security = deputies, the bailiff, and the sheriff
-job-supervisors-science = scientists, the senior researcher, and the research director
+job-supervisors-engineering = station engineers, atmospheric technicians, and the chief engineer
+job-supervisors-medicine = medical doctors, chemists, and the chief medical officer
+job-supervisors-security = security officers, the warden, and the head of security
+job-supervisors-science = scientists, and the research director
 job-supervisors-hire = whoever hires you
-job-supervisors-everyone = absolutely everyone
+job-supervisors-everyone = absolutely everyone
diff --git a/Resources/Maps/Shuttles/prowler.yml b/Resources/Maps/Shuttles/prowler.yml
@@ -1704,7 +1704,7 @@ entities:
       pos: 1.5,7.5
       parent: 1
       type: Transform
-- proto: ClothingOuterHardsuitSecuritypatrol
+- proto: ClothingOuterHardsuitNfsdBronze
   entities:
   - uid: 242
     components:

diff --git a/Resources/Maps/Shuttles/templar.yml b/Resources/Maps/Shuttles/templar.yml
@@ -489,7 +489,7 @@ entities:
     - canCollide: False
       type: Physics
     - type: InsideEntityStorage
-- proto: ClothingOuterHardsuitSecuritypatrol
+- proto: ClothingOuterHardsuitNfsdBronze
   entities:
   - uid: 51
     components:

diff --git a/Resources/Maps/_NF/POI/nfsd.yml b/Resources/Maps/_NF/POI/nfsd.yml
@@ -16326,7 +16326,7 @@ entities:
     - type: Transform
       pos: -4.5,-3.5
       parent: 1
-- proto: VendingMachineCart
+- proto: VendingMachineCartNfsd
   entities:
   - uid: 934
     components: