Merge branch 'master' of https://github.com/new-frontiers-14/frontier…

…-station-14 into Construct-Fans
new-frontiers-14 · Oct 12, 2024 · c4a741e · c4a741e
2 parents 67326c8 + fc45cc1
commit c4a741e
Show file tree

Hide file tree

Showing 68 changed files with 690 additions and 972 deletions.
diff --git a/Content.Client/Crayon/CrayonSystem.cs b/Content.Client/Crayon/CrayonSystem.cs
@@ -65,6 +65,17 @@ protected override void FrameUpdate(FrameEventArgs args)
             }
 
             _parent.UIUpdateNeeded = false;
+
+            // Frontier: unlimited crayon
+            if (_parent.Capacity == int.MaxValue)
+            {
+                _label.SetMarkup(Robust.Shared.Localization.Loc.GetString("crayon-drawing-label-unlimited",
+                    ("color", _parent.Color),
+                    ("state", _parent.SelectedState)));
+                return;
+            }
+            // End Frontier
+
             _label.SetMarkup(Robust.Shared.Localization.Loc.GetString("crayon-drawing-label",
                 ("color",_parent.Color),
                 ("state",_parent.SelectedState),

diff --git a/Content.Server/Crayon/CrayonSystem.cs b/Content.Server/Crayon/CrayonSystem.cs
@@ -14,7 +14,6 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.GameStates;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Crayon;
@@ -74,9 +73,14 @@ private void OnCrayonAfterInteract(EntityUid uid, CrayonComponent component, Aft
         if (component.UseSound != null)
             _audio.PlayPvs(component.UseSound, uid, AudioParams.Default.WithVariation(0.125f));
 
-        // Decrease "Ammo"
-        component.Charges--;
-        Dirty(uid, component);
+        // Frontier: check if crayon is infinite
+        if (component.Charges != int.MaxValue)
+        {
+            // Decrease "Ammo"
+            component.Charges--;
+            Dirty(uid, component);
+        }
+        // End Frontier
 
         _adminLogger.Add(LogType.CrayonDraw, LogImpact.Low, $"{EntityManager.ToPrettyString(args.User):user} drew a {component.Color:color} {component.SelectedState}");
         args.Handled = true;

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
@@ -4325,3 +4325,35 @@ Entries:
       message: The Crescent now has been fitted with Air Alarms, engineers rejoice!
   id: 5368
   time: '2024-10-07T16:38:08.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: New poster for the FSB Spirit and two new EMS signs.
+  id: 5369
+  time: '2024-10-09T21:40:26.0000000+00:00'
+- author: Leander
+  changes:
+    - type: Add
+      message: >-
+        Added magic crayon and its selection on the Fun loadouts, paint the
+        world with it!
+  id: 5370
+  time: '2024-10-09T21:54:59.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: updated barge with directional fans
+  id: 5371
+  time: '2024-10-11T19:54:36.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: Updated Barnacle with directional fans.
+  id: 5372
+  time: '2024-10-11T20:05:14.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: Update Empress tiny fans with directional fans.
+  id: 5373
+  time: '2024-10-12T00:34:19.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/crayon/crayon-component.ftl b/Resources/Locale/en-US/_NF/crayon/crayon-component.ftl
@@ -0,0 +1 @@
+crayon-drawing-label-unlimited = Drawing: [color={$color}]{$state}[/color]
diff --git a/Resources/Locale/en-US/_NF/job/job-description.ftl b/Resources/Locale/en-US/_NF/job/job-description.ftl
@@ -3,7 +3,7 @@ job-description-brigmedic-nf = Fight in the rear of the sheriff's service, for t
 job-description-cadet-nf = Learn the basics of arresting criminals and managing the brig. Listen to your supervisors and feel free to ask them for any help.
 job-description-contractor = Fulfill any profitable contracts out on the frontier of NT space.
 job-description-deputy = Catch criminals and enemies of the corporation, enforce the law, and ensure that the sector does not fall into disarray.
-job-description-detective-nf = Investigate crime scenes using forensic tools, ensure that the guilty party is found, and have a couple smokes.
+job-description-nf-detective = Investigate crime scenes using forensic tools, ensure that the guilty party is found, and have a couple smokes.
 job-description-ertmailcarrier = Nothing stops the mail.
 job-description-mercenary = Execute the bidding of anyone- for the right price. Enjoy being unbound from the confines of the law.
 job-description-pilot = Pilot spaceships from point A to B, outmaneuver pirates and dodge asteroids. You are a leaf on the solar wind, let others marvel at how you soar.

diff --git a/Resources/Locale/en-US/_NF/job/job-names.ftl b/Resources/Locale/en-US/_NF/job/job-names.ftl
@@ -4,7 +4,7 @@ job-name-brigmedic = Brigmedic
 job-name-cadet-nf = Cadet
 job-name-contractor = Contractor
 job-name-deputy = Deputy
-job-name-detective-nf = Detective
+job-name-nf-detective = Detective
 job-name-ertmailcarrier = ERT Mail Carrier
 job-name-mercenary = Mercenary
 job-name-pilot = Pilot

diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml
@@ -171,16 +171,6 @@ entities:
       - 227
       - 213
       - 215
-- proto: AirCanister
-  entities:
-  - uid: 57
-    components:
-    - type: Transform
-      anchored: True
-      pos: -5.5,-2.5
-      parent: 201
-    - type: Physics
-      bodyType: Static
 - proto: AirlockExternalGlass
   entities:
   - uid: 142
@@ -228,38 +218,43 @@ entities:
     - type: Transform
       pos: 1.3489224,-4.3157334
       parent: 201
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
-  - uid: 11
+  - uid: 28
     components:
     - type: Transform
-      pos: 0.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: -6.5,0.5
       parent: 201
-  - uid: 12
+  - uid: 57
     components:
     - type: Transform
-      pos: 0.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-1.5
       parent: 201
-  - uid: 13
+  - uid: 62
     components:
     - type: Transform
-      pos: 0.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-0.5
       parent: 201
-  - uid: 27
+  - uid: 122
     components:
     - type: Transform
-      pos: -6.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-0.5
       parent: 201
-  - uid: 28
+  - uid: 166
     components:
     - type: Transform
-      pos: -6.5,0.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-1.5
       parent: 201
-  - uid: 73
+  - uid: 226
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-0.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-2.5
       parent: 201
 - proto: AtmosFixBlockerMarker
   entities:
@@ -341,27 +336,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-2.5
       parent: 201
-    - type: DeviceLinkSink
-      links:
-      - 103
   - uid: 171
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,-0.5
       parent: 201
-    - type: DeviceLinkSink
-      links:
-      - 103
   - uid: 172
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,-1.5
       parent: 201
-    - type: DeviceLinkSink
-      links:
-      - 103
 - proto: CableApcExtension
   entities:
   - uid: 69
@@ -755,6 +741,19 @@ entities:
     - type: Transform
       pos: -2.5,-3.5
       parent: 201
+- proto: GasMixerOn
+  entities:
+  - uid: 67
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-0.5
+      parent: 201
+    - type: GasMixer
+      inletTwoConcentration: 0.79
+      inletOneConcentration: 0.21
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPassiveVent
   entities:
   - uid: 123
@@ -809,6 +808,13 @@ entities:
       parent: 201
     - type: AtmosPipeColor
       color: '#1010FFFF'
+  - uid: 11
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 201
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 119
     components:
     - type: Transform
@@ -918,14 +924,6 @@ entities:
       parent: 201
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 225
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-3.5
-      parent: 201
-    - type: AtmosPipeColor
-      color: '#990000FF'
 - proto: GasPipeTJunction
   entities:
   - uid: 117
@@ -946,25 +944,25 @@ entities:
       color: '#990000FF'
 - proto: GasPort
   entities:
-  - uid: 42
+  - uid: 12
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -5.5,-2.5
+      pos: -3.5,-2.5
       parent: 201
     - type: AtmosPipeColor
-      color: '#1010FFFF'
-- proto: GasPressurePump
-  entities:
-  - uid: 120
+      color: '#0055CCFF'
+  - uid: 42
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-0.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,-2.5
       parent: 201
     - type: AtmosPipeColor
       color: '#1010FFFF'
-  - uid: 122
+- proto: GasPressurePumpOnMax
+  entities:
+  - uid: 73
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -1157,8 +1155,14 @@ entities:
     - type: Transform
       pos: -4.5,2.5
       parent: 201
-    - type: Thruster
-      originalPowerLoad: 1500
+- proto: LockerWallMaterialsFuelPlasmaFilled
+  entities:
+  - uid: 120
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-6.5
+      parent: 201
 - proto: MachineFrame
   entities:
   - uid: 41
@@ -1174,6 +1178,26 @@ entities:
     - type: Transform
       pos: 1.6783751,-4.3457556
       parent: 201
+- proto: NitrogenCanister
+  entities:
+  - uid: 27
+    components:
+    - type: Transform
+      anchored: True
+      pos: -3.5,-2.5
+      parent: 201
+    - type: Physics
+      bodyType: Static
+- proto: OxygenCanister
+  entities:
+  - uid: 13
+    components:
+    - type: Transform
+      anchored: True
+      pos: -5.5,-2.5
+      parent: 201
+    - type: Physics
+      bodyType: Static
 - proto: PirateFlag
   entities:
   - uid: 14
@@ -1392,17 +1416,6 @@ entities:
         23:
         - Pressed: Toggle
         - Pressed: Trigger
-- proto: SheetPlasma
-  entities:
-  - uid: 166
-    components:
-    - type: Transform
-      pos: 0.4796412,-5.530752
-      parent: 201
-    - type: Stack
-      count: 15
-    - type: Item
-      size: 15
 - proto: ShuttleGunPirateCannon
   entities:
   - uid: 23
@@ -1411,9 +1424,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 1.5,-0.5
       parent: 201
-    - type: DeviceLinkSink
-      links:
-      - 252
 - proto: SignalButtonDirectional
   entities:
   - uid: 103
@@ -1518,31 +1528,23 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,-7.5
       parent: 201
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 137
     components:
     - type: Transform
       pos: -4.5,3.5
       parent: 201
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 138
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,-7.5
       parent: 201
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 150
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -5.5,2.5
       parent: 201
-    - type: Thruster
-      originalPowerLoad: 1500
 - proto: WallWood
   entities:
   - uid: 10

diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml
@@ -2933,7 +2933,7 @@ entities:
     - type: Transform
       pos: -0.5,9.5
       parent: 1
-- proto: SignShield
+- proto: NFSignShield
   entities:
   - uid: 359
     components:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		crayon-drawing-label-unlimited = Drawing: [color={$color}]{$state}[/color]