Merge branch 'master' of https://github.com/dvir001/frontier-station-14…

… into pr/1207

Content.Server/Bed/Sleep/SleepingSystem.cs

@@ -12,6 +12,7 @@
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Slippery;
+using Content.Shared.Sound.Components;
 using Content.Shared.StatusEffect;
 using Content.Shared.Stunnable;
 using Content.Shared.Verbs;

Content.Server/Cargo/Systems/PricingSystem.cs

@@ -230,6 +230,7 @@ public double GetEstimatedVendPrice(EntityPrototype prototype)
     public double GetPrice(EntityUid uid)
     {
         var ev = new PriceCalculationEvent();
+        ev.Price = 0; // Structs doesnt initialize doubles when called by constructor.
         RaiseLocalEvent(uid, ref ev);
 
         if (ev.Handled)

Content.Server/Power/Components/BatteryComponent.cs

@@ -35,6 +35,17 @@ public partial class BatteryComponent : Component
         /// </summary>
         [DataField]
         public float PricePerJoule = 0.0001f;
+
+        [Obsolete("Use system method")]
+        public bool TryUseCharge(float value)
+            => _entMan.System<BatterySystem>().TryUseCharge(Owner, value, this);
+
+        /// <summary>
+        /// Whether or not information about
+        /// the battery will be shown on examine.
+        /// </summary>
+        [DataField]
+        public bool ShowExamineText = true;
     }
 
     /// <summary>

Content.Server/Power/EntitySystems/BatterySystem.cs

@@ -39,7 +39,7 @@ private void OnExamine(EntityUid uid, ExaminableBatteryComponent component, Exam
         {
             if (!TryComp<BatteryComponent>(uid, out var batteryComponent))
                 return;
-            if (args.IsInDetailsRange)
+            if (args.IsInDetailsRange && batteryComponent.ShowExamineText)
             {
                 var effectiveMax = batteryComponent.MaxCharge;
                 if (effectiveMax == 0)

Content.Server/Sound/EmitSoundSystem.cs

@@ -3,8 +3,7 @@
 using Content.Shared.UserInterface;
 using Content.Shared.Sound;
 using Content.Shared.Sound.Components;
-using Robust.Shared.Timing;
-using Robust.Shared.Network;
+using Robust.Shared.Random;
 
 namespace Content.Server.Sound;
 

Content.Shared/Access/Components/IdCardConsoleComponent.cs

@@ -47,40 +47,40 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
     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",
         "StationTrafficController", // Frontier
-        "Theatre",
+        //"Theatre",
     };
 
     [Serializable, NetSerializable]

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.

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";

Content.Shared/Sound/Components/SpamEmitSoundComponent.cs

@@ -3,42 +3,24 @@
 namespace Content.Shared.Sound.Components;
 
 /// <summary>
-/// Repeatedly plays a sound with a randomized delay.
+/// Rolls to play a sound every few seconds.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentState, AutoGenerateComponentPause]
+[RegisterComponent]
 public sealed partial class SpamEmitSoundComponent : BaseEmitSoundComponent
 {
-    /// <summary>
-    /// The time at which the next sound will play.
-    /// </summary>
-    [DataField, AutoPausedField, AutoNetworkedField]
-    public TimeSpan NextSound;
+    [DataField("accumulator")]
+    public float Accumulator = 0f;
 
-    /// <summary>
-    /// The minimum time in seconds between playing the sound.
-    /// </summary>
-    [DataField]
-    public TimeSpan MinInterval = TimeSpan.FromSeconds(2);
+    [DataField("rollInterval")]
+    public float RollInterval = 2f;
 
-    /// <summary>
-    /// The maximum time in seconds between playing the sound.
-    /// </summary>
-    [DataField]
-    public TimeSpan MaxInterval = TimeSpan.FromSeconds(2);
+    [DataField("playChance")]
+    public float PlayChance = 0.5f;
 
     // Always Pvs.
-    /// <summary>
-    /// Content of a popup message to display whenever the sound plays.
-    /// </summary>
-    [DataField]
-    public LocId? PopUp;
+    [DataField("popUp")]
+    public string? PopUp;
 
-    /// <summary>
-    /// Whether the timer is currently running and sounds are being played.
-    /// Do not set this directly, use <see cref="EmitSoundSystem.SetEnabled"/>
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    [Access(typeof(SharedEmitSoundSystem))]
+    [DataField("enabled")]
     public bool Enabled = true;
 }

Content.Shared/Sound/SharedEmitSoundSystem.cs

@@ -31,8 +31,8 @@ public abstract class SharedEmitSoundSystem : EntitySystem
     [Dependency] private readonly INetManager _netMan = default!;
     [Dependency] private readonly ITileDefinitionManager _tileDefMan = default!;
     [Dependency] protected readonly IRobustRandom Random = default!;
-    [Dependency] private   readonly SharedAmbientSoundSystem _ambient = default!;
-    [Dependency] private   readonly SharedAudioSystem _audioSystem = default!;
+    [Dependency] private readonly SharedAmbientSoundSystem _ambient = default!;
+    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
 
     public override void Initialize()
@@ -64,6 +64,9 @@ private void OnMobState(Entity<SoundWhileAliveComponent> entity, ref MobStateCha
         _ambient.SetAmbience(entity.Owner, args.NewMobState != MobState.Dead);
     }
 
+        _ambient.SetAmbience(entity.Owner, args.NewMobState != MobState.Dead);
+    }
+
     private void OnEmitSpawnOnInit(EntityUid uid, EmitSoundOnSpawnComponent component, MapInitEvent args)
     {
         TryEmitSound(uid, component, predict: false);

Resources/Changelog/Changelog.yml

@@ -4033,3 +4033,61 @@ Entries:
       message: Messenger Bag of Holding is now visible when worn.
   id: 4912
   time: '2024-04-15T15:11:12.0000000+00:00'
+- author: Leander
+  changes:
+    - type: Add
+      message: >-
+        added grenade bundles to the NFSD uplink and make the experimental
+        combat hardsuit available.
+  id: 4913
+  time: '2024-04-17T21:38:15.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Tweak
+      message: >-
+        Added the new Expeditionary FlatpackVend to the Lodge, not restockable
+        but contains expedition unique machines like the IFF,  
+  id: 4914
+  time: '2024-04-17T21:40:06.0000000+00:00'
+- author: GreaseMonk
+  changes:
+    - type: Fix
+      message: Fixed various issues with artifact construct including sell price.
+    - type: Tweak
+      message: Increased artifact construct health.
+    - type: Add
+      message: Added artifact construct chatter sound.
+  id: 4915
+  time: '2024-04-17T21:43:04.0000000+00:00'
+- author: MagnusCrowe
+  changes:
+    - type: Add
+      message: Added new uniform for station guard and private security.
+    - type: Add
+      message: Added a full suite of clothing for the station representative.
+  id: 4916
+  time: '2024-04-17T22:04:59.0000000+00:00'
+- author: Kesiath
+  changes:
+    - type: Tweak
+      message: Nerfed bluespace bags to only 4 additional bag columns.
+  id: 4917
+  time: '2024-04-18T20:49:44.0000000+00:00'
+- author: Leander
+  changes:
+    - type: Add
+      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'

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

@@ -3,3 +3,4 @@ job-description-mercenary = Execute the bidding of anyone- for the right price.
 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.
 job-description-security-guard = Patrol the empty halls, whistle simple tunes you heard on radio, jingle your keychain and scurry away at the sight of danger.
 job-description-stc = Expertly de-conflict the space around the station and help the NFSD issue fines for overdocked ships.
+job-description-sr = Handle access reassignment fairly using your ID console, manage Frontier outpost, and keep Clippy safe.

Resources/Locale/en-US/_NF/job/job-names-old.ftl

@@ -0,0 +1,7 @@
+# Role timers
+JobSecurityCadetOld = Security Cadet
+JobSecurityOfficerOld = Security Officer
+JobHeadOfSecurityOld = Head of Security
+JobWardenOld = Warden
+JobDetectiveOld = Detective
+JobHeadOfPersonnelOld = Head of Personnel

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

@@ -3,10 +3,11 @@ job-name-mercenary = Mercenary
 job-name-pilot = Pilot
 job-name-security-guard = Security Guard
 job-name-stc = Station Traffic Controller
+job-name-sr = Station Representative
 
 # Role timers - Make these alphabetical or I cut you
 JobERTMailCarrier = ERT Mail Carrier
 JobMercenary = Mercenary
 JobPilot = Pilot
 JobSecurityGuard = Security Guard
-JobSTC = Station Traffic Controller
+JobSTC = Station Traffic Controller

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

Resources/Locale/en-US/_NF/paper/stamp-component.ftl

@@ -5,3 +5,4 @@ stamp-component-signee-name = {$user}
 stamp-component-stamped-name-psychologist = Psychologist
 stamp-component-stamped-name-lawyer = Lawyer
 stamp-component-stamped-name-stc = Station Traffic Controller
+stamp-component-stamped-name-sr = Station Representative

Resources/Locale/en-US/_NF/store/uplink-catalog.ftl

@@ -5,6 +5,8 @@ store-category-sechardsuits = EVA Suits
 store-category-secweapons = Weapons
 store-category-secutility = Utility
 store-category-secammo = Ammunition
+store-category-secexplosives = Explosives
+
 
 uplink-security-hardsuit-name = Security HardSuit
 uplink-security-hardsuit-desc = Standard issue armored EVA suit. Bulky armor plating slightly limits movement speed.
@@ -14,8 +16,8 @@ uplink-security-hardsuit-brigmedic-name = BrigMedic HardSuit
 uplink-security-hardsuit-brigmedic-desc = A lightly armored EVA suit. Designed for rescue operations, it sacrifices most of its armor in favor of movement speed.
 uplink-security-hardsuit-warden-name = Bailiff HardSuit
 uplink-security-hardsuit-warden-desc = A moderately reinforced variant of the Security EVA suit. Modern plating increases resistances without sacrificing range of motion.
-uplink-security-hardsuit-syndie-re-name = Reverse Engineered Combat Suit
-uplink-security-hardsuit-syndie-re-desc = An advanced combat suit recovered from the Syndicate Wars. Heavily protected and extremely mobile.
+uplink-security-hardsuit-experimental-name = Experimental Combat Suit
+uplink-security-hardsuit-experimental-desc = An advanced combat suit researched by the greatest Nanotrasen minds. Heavily protected and extremely mobile.
 uplink-security-hardsuit-sheriff-name = Sheriff's HardSuit
 uplink-security-hardsuit-sheriff-desc = A heavily reinforced Security EVA suit. Provides maximum resistance while maintaining the range of motion expected of security forces.
 uplink-security-mk58-name = MK 58
@@ -54,7 +56,7 @@ uplink-security-holo-name = Holo Barrier
 uplink-security-holo-desc = A battery powered holo projecter that places temporary barriers to bar movement.
 uplink-security-jetpack-name = Jetpack
 uplink-security-jetpack-desc = A pre-filled jetpack for EVA. Comes in a fashionable red.
-uplink-security-magboots-name = Combat Magboots
+uplink-security-magboots-name = NFSD Magboots
 uplink-security-magboots-desc = Light weight magboots designed to keep the wearer grounded in low and no gravity environments.
 uplink-security-techfab-name = Security Techfab
 uplink-security-techfab-desc = A circuit board for a Security Techfab. Allows the production of ammunition, magazines, weapons, and numerous other utilities. Uses raw resources. Can be upgraded.
@@ -112,3 +114,21 @@ uplink-security-shotslug-name = Lethal Shotgun Slug Shells
 uplink-security-shotslug-desc = A box of lethal .50 calibre slug shotgun shells.
 uplink-security-cash1000-name = 1000 Spesos
 uplink-security-cash1000-desc = Cold, hard cash.
+uplink-security-empgrenade-box-name = EMP Grenade Box
+uplink-security-empgrenade-box-desc = A box containing 4 EMP grenades.
+uplink-security-explosivegrenade-box-name = Explosive Grenade Box
+uplink-security-explosivegrenade-box-desc = A box containing 4 explosive grenades.
+uplink-security-incendiarygrenade-box-name = Incendiary Grenade Box
+uplink-security-incendiarygrenade-box-desc = A box containing 4 incendiary grenades.
+uplink-security-shrapnelgrenade-box-name = Shrapnel Grenade Box
+uplink-security-shrapnelgrenade-box-desc = A box containing 4 shrapnel grenades.
+uplink-security-smokegrenade-box-name = Smoke Grenade Box
+uplink-security-smokegrenade-box-desc = A box containing 4 smoke grenades.
+uplink-security-teargasgrenade-box-name = Tear gas Grenade Box
+uplink-security-teargasgrenade-box-desc = A box containing 4 tear gas grenades.
+uplink-security-flashbanggrenade-box-name = Flashbang Grenade Box
+uplink-security-flashbanggrenade-box-desc = A box containing 4 flasbang grenades.
+uplink-security-stingergrenade-box-name = Stinger Grenade Box
+uplink-security-stingergrenade-box-desc = A box containing 4 stinger grenades.
+uplink-security-breachingcharge-box-name = Breaching Charge Box
+uplink-security-breachingcharge-box-desc = A box containing 4 breaching charges.

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

Resources/Locale/en-US/paper/stamp-component.ftl

@@ -9,7 +9,7 @@ stamp-component-stamped-name-clown = Clown
 stamp-component-stamped-name-cmo = Chief Medical Officer
 stamp-component-stamped-name-denied = DENIED
 stamp-component-stamped-name-approved = APPROVED
-stamp-component-stamped-name-hop = Station Representative
+stamp-component-stamped-name-hop = Head of Personnel
 stamp-component-stamped-name-hos = Sheriff
 stamp-component-stamped-name-qm = Quartermaster
 stamp-component-stamped-name-rd = Research Director