Merge branch 'master' into Judge

new-frontiers-14 · Oct 11, 2024 · 6e5c43b · 6e5c43b
2 parents 6c41d25 + df3d862
commit 6e5c43b
Show file tree

Hide file tree

Showing 64 changed files with 323 additions and 134 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,17 @@ 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'
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/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:

diff --git a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml
@@ -10574,7 +10574,7 @@ entities:
     - type: Transform
       pos: 2.5,-11.5
       parent: 1
-- proto: SignShield
+- proto: NFSignShield
   entities:
   - uid: 1261
     components:

diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml
@@ -11602,7 +11602,6 @@ entities:
         - Pressed: Toggle
         2543:
         - Pressed: Toggle
-        12: []
         2541:
         - Pressed: Toggle
         2544:

diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml b/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml
@@ -5872,7 +5872,7 @@ entities:
     - type: Transform
       pos: 1.7114414,-8.847875
       parent: 2
-- proto: SignShield
+- proto: NFSignShield
   entities:
   - uid: 858
     components:

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -477,6 +477,7 @@
 - type: entity
   id: SpawnPointDetective
   parent: SpawnPointJobBase
+  abstract: true # Frontier
   name: detective
   components:
   - type: SpawnPoint

diff --git a/Resources/Prototypes/Recipes/Reactions/biological.yml b/Resources/Prototypes/Recipes/Reactions/biological.yml
@@ -11,7 +11,7 @@
     Iron: 0.5
     Sugar: 2
     CarbonDioxide: 3
-    Protein: 4
+#    Protein: 4 # Frontier
 
 - type: reaction
   id: SlimeBloodBreakdown
@@ -51,7 +51,7 @@
     Copper: 0.5
     Sugar: 2
     CarbonDioxide: 3
-    Protein: 4
+#    Protein: 4 # Frontier
 
 - type: reaction
   id: ZombieBloodBreakdown
@@ -63,5 +63,5 @@
       amount: 4
   products:
     Mold: 2
-    Protein: 1
+#    Protein: 1 # Frontier
     Toxin: 1
diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml
@@ -338,7 +338,7 @@
   products:
     Fat: 6
     Water: 3
-    Protein: 1 #water & protein represent aqueous proteins
+#    Protein: 1 #water & protein represent aqueous proteins # Frontier
 
 #- type: reaction
 #  id: SugarBreakdown

diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -126,7 +126,7 @@
   - PrisonGuard ##nyano
   - Brigmedic # Frontier
 #  - SecurityGuard # Frontier
-  - DetectiveNF # Frontier
+  - NFDetective # Frontier
   - Cadet # Frontier
   - Deputy # Frontier
   - Bailiff # Frontier

diff --git a/Resources/Prototypes/_Park/benches.yml → ...es/Prototypes/SimpleStation14/benches.yml b/Resources/Prototypes/_Park/benches.yml → ...es/Prototypes/SimpleStation14/benches.yml
@@ -7,6 +7,8 @@
   parent: SeatBase
   description: Multiple seats spanning a single object. Truly a marvel of science.
   components:
+  - type: Physics
+    bodyType: Static
   - type: Transform
     anchored: true
   - type: Rotatable
@@ -233,8 +235,6 @@
     state: corner
   - type: Clickable
   - type: InteractionOutline
-  - type: Physics
-    bodyType: Dynamic
   - type: Pullable
   - type: Damageable
     damageContainer: Inorganic
@@ -304,8 +304,6 @@
     state: corner
   - type: Clickable
   - type: InteractionOutline
-  - type: Physics
-    bodyType: Dynamic
   - type: Pullable
   - type: Damageable
     damageContainer: Inorganic
@@ -323,4 +321,4 @@
           collection: MetalBreak
   - type: Construction # Frontier
     graph: SofasGraph # Frontier
-    node: BenchSofaCorpCornerNode # Frontier
+    node: BenchSofaCorpCornerNode # Frontier
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml
@@ -32,7 +32,7 @@
     CadetPDA: 10
     DeputyPDA: 10
     BrigmedicNFPDA: 10
-    DetectiveNFPDA: 10
+    NFDetectivePDA: 10
     SergeantPDA: 10
     BailiffPDA: 10
     ClothingHeadsetNfsdBrownCommon: 4294967295 #infinite

diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml
@@ -152,13 +152,12 @@
       - state: warden
 
 - type: entity
-  id: SpawnPointDetectiveNF
+  id: NFSpawnPointDetective
   parent: SpawnPointDetective
   name: detective
-  suffix: Frontier
   components:
   - type: SpawnPoint
-    job_id: DetectiveNF
+    job_id: NFDetective
   - type: Sprite
     layers:
       - state: green

diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/posters.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/posters.yml
@@ -78,4 +78,6 @@
       - NFPosterContrabandFsbStasisDD
       - NFPosterContrabandFsbApothecaryDD
       - NFPosterContrabandFsbLogoDD
+      - NFPosterContrabandFsbSpiritDD
+      - NFPosterContrabandEmsCoordsDD
     chance: 1
diff --git a/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml b/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml
@@ -17,7 +17,7 @@
       - Brigmedic
       - Cadet
       - Deputy
-      - DetectiveNF
+      - NFDetective
       - SeniorOfficer
       - Sheriff
       - SecurityGuard

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml
@@ -144,11 +144,11 @@
 
 - type: entity
   parent: CadetIDCard
-  id: DetectiveNFIDCard
+  id: NFDetectiveIDCard
   name: nfsd detective ID card
   components:
   - type: PresetIdCard
-    job: DetectiveNF
+    job: NFDetective
   - type: Sprite
     sprite: _NF/Objects/Misc/id_cards.rsi
     layers:

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml
@@ -332,13 +332,13 @@
 
 - type: entity
   parent: BasePDA
-  id: DetectiveNFPDA
+  id: NFDetectivePDA
   name: detective PDA
   description: Smells like rain... pouring down the rooftops...
   components:
   - type: Pda
-    id: DetectiveNFIDCard
-    state: pda-detectivenf
+    id: NFDetectiveIDCard
+    state: pda-nfdetective
     bookSlot: # Frontier
       startingItem: HyperlinkBookNfsdSop
       priority: -2
@@ -362,7 +362,7 @@
       visible: false
   - type: Icon
     sprite: _NF/Objects/Devices/pda.rsi
-    state: pda-detectivenf
+    state: pda-nfdetective
 
 - type: entity
   parent: BasePDA

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml
@@ -0,0 +1,28 @@
+- type: entity
+  parent: CrayonRainbow
+  id: CrayonMagic
+  name: magic crayon
+  description: Specially blended with bluespace crystals and certified non-toxic.
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Fun/magic_crayon.rsi
+    state: icon
+  - type: Item
+    sprite: _NF/Objects/Fun/magic_crayon.rsi
+    heldPrefix: icon
+  - type: Tag # Removing trash & recyclable
+    tags:
+    - Write
+    - Crayon
+  - type: Crayon
+    capacity: 2147483647 # int.MaxValue, infinite charges
+  - type: FlavorProfile
+    flavors:
+    - chewy
+    - magical
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Nothing
+          Quantity: 40
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/contraband.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/contraband.yml
@@ -335,3 +335,13 @@
   parent: [DeadDropBase, NFPosterContrabandFsbApothecary]
   id: NFPosterContrabandFsbApothecaryDD
   suffix: DeadDrop
+
+- type: entity
+  parent: [DeadDropBase, NFPosterContrabandFsbSpirit]
+  id: NFPosterContrabandFsbSpiritDD
+  suffix: DeadDrop
+
+- type: entity
+  parent: [DeadDropBase, NFPosterContrabandEmsCoords]
+  id: NFPosterContrabandEmsCoordsDD
+  suffix: DeadDrop
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml
@@ -67,3 +67,23 @@
   - type: Sprite
     sprite: _NF/Structures/Wallmounts/posters.rsi
     state: nf_poster6_contraband
+
+- type: entity
+  parent: PosterBase
+  id: NFPosterContrabandFsbSpirit
+  name: "Far Star Biotech Spirit"
+  description: "The FSB Spirit! We know what your life is worth."
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Wallmounts/posters.rsi
+    state: nf_poster7_contraband
+
+- type: entity
+  parent: PosterBase
+  id: NFPosterContrabandEmsCoords
+  name: "EMS Suit Coordinates Reminder"
+  description: "Rosy the Medroach reminding you to turn your suit coordinates! Make sure your next death isn't your last!"
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Wallmounts/posters.rsi
+    state: nf_poster8_contraband
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml
@@ -186,3 +186,30 @@
   components:
   - type: Sprite
     state: bus
+
+- type: entity
+  parent: NFBaseSign
+  id: NFSignShield
+  name: shield sign
+  description: A sign with a shield.
+  components:
+  - type: Sprite
+    state: shield
+
+- type: entity
+  parent: NFBaseSign
+  id: NFSignEms1
+  name: emergency medical service sign
+  description: A sign that indicates emergency medical services.
+  components:
+  - type: Sprite
+    state: ems1
+
+- type: entity
+  parent: NFBaseSign
+  id: NFSignEms2
+  name: emergency medical service sign
+  description: A sign that indicates emergency medical services.
+  components:
+  - type: Sprite
+    state: ems2
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml
@@ -193,3 +193,12 @@
   price: 10000
   inhand:
     - PetCarrierNPCEmotionalSupportSafe
+
+- type: loadout
+  id: ContractorCrayonMagic
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT3
+  price: 30000
+  inhand:
+    - CrayonMagic
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		crayon-drawing-label-unlimited = Drawing: [color={$color}]{$state}[/color]
-Original file line number
+Diff line change
@@ Expand Up / @@ -11602,7 +11602,6 @@ entities: @@
             - Pressed: Toggle
 :
             - Pressed: Toggle
-: []
 :
             - Pressed: Toggle
 :
@@ Expand Down @@