Merge pull request #109 from Corvax-Frontier/upstream02052024

Upstream02052024

Content.Server/StationEvents/Events/IonStormRule.cs

@@ -64,15 +64,19 @@ protected override void Started(EntityUid uid, IonStormRuleComponent comp, GameR
     {
         base.Started(uid, comp, gameRule, args);
 
-        if (!TryGetRandomStation(out var chosenStation))
-            return;
+        // Frontier - Affect all silicon beings in the sector, not just on-station.
+        // if (!TryGetRandomStation(out var chosenStation))
+        //     return;
+        // End Frontier
 
         var query = EntityQueryEnumerator<SiliconLawBoundComponent, TransformComponent, IonStormTargetComponent>();
         while (query.MoveNext(out var ent, out var lawBound, out var xform, out var target))
         {
-            // only affect law holders on the station
-            if (CompOrNull<StationMemberComponent>(xform.GridUid)?.Station != chosenStation)
-                continue;
+            // Frontier - Affect all silicon beings in the sector, not just on-station.
+            // // only affect law holders on the station
+            // if (CompOrNull<StationMemberComponent>(xform.GridUid)?.Station != chosenStation)
+            //     continue;
+            // End Frontier
 
             if (!RobustRandom.Prob(target.Chance))
                 continue;

Content.Shared/DeltaV/StepTrigger/Component/NoShoesSilentFootstepsComponent.cs

@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.StepTrigger.Components;
+
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class NoShoesSilentFootstepsComponent : Component
+{
+}

Content.Shared/Movement/Systems/SharedMoverController.cs

@@ -23,6 +23,7 @@
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using PullableComponent = Content.Shared.Movement.Pulling.Components.PullableComponent;
+using Content.Shared.StepTrigger.Components; // Delta V-NoShoesSilentFootstepsComponent
 
 namespace Content.Shared.Movement.Systems
 {
@@ -46,6 +47,7 @@ public abstract partial class SharedMoverController : VirtualController
         [Dependency] protected readonly SharedPhysicsSystem Physics = default!;
         [Dependency] private   readonly SharedTransformSystem _transform = default!;
         [Dependency] private   readonly TagSystem _tags = default!;
+        [Dependency] private   readonly IEntityManager _entities = default!; // Delta V-NoShoesSilentFootstepsComponent
 
         protected EntityQuery<InputMoverComponent> MoverQuery;
         protected EntityQuery<MobMoverComponent> MobMoverQuery;
@@ -438,6 +440,14 @@ private bool TryGetSound(
                 sound = moverModifier.FootstepSoundCollection;
                 return true;
             }
+
+            // If got the component in yml and no shoes = no sound. Delta V
+            if (_entities.TryGetComponent(uid, out NoShoesSilentFootstepsComponent? _) &
+                !_inventory.TryGetSlotEntity(uid, "shoes", out var _))
+            {
+                return false;
+            }
+            // Delta V NoShoesSilentFootsteps till here.
 
             if (_inventory.TryGetSlotEntity(uid, "shoes", out var shoes) &&
                 TryComp<FootstepModifierComponent>(shoes, out var modifier))

Resources/Audio/_NF/Voice/Goblin/attributions.yml

@@ -1,32 +1,32 @@
 - files: ["goblin-cackle-01.ogg, goblin-cackle-02.ogg, goblin-cackle-03.ogg"]
   license: "CC0-1.0"
-  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (converted to mono, cropped, lowered amplitudes) by erhardsteinhauer (discord/github)"
   source: "https://freesound.org/people/SnowFightStudios/sounds/643664/"
 - files: ["goblin-cackle-04.ogg"]
   license: "CC0-1.0"
-  copyright: "Original file made by spookymodem (https://freesound.org/people/spookymodem/), edited (cropped) by erhardsteinhauer (discord/github)"
+  copyright: "Original file made by spookymodem (https://freesound.org/people/spookymodem/), edited (converted to mono, cropped) by erhardsteinhauer (discord/github)"
   source: "https://freesound.org/people/spookymodem/sounds/202096/"
 - files: ["goblin-cackle-05.ogg"]
   license: "CC-BY-4.0"
   copyright: "Original file made by Nanakisan (https://freesound.org/people/Nanakisan/)"
   source: "https://freesound.org/people/Nanakisan/sounds/253532/"
 - files: ["goblin-scream-01.ogg"]
   license: "CC0-1.0"
-  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (converted to mono, cropped) by erhardsteinhauer (discord/github)"
   source: "https://freesound.org/people/SnowFightStudios/sounds/643655/"
 - files: ["goblin-scream-02.ogg, goblin-scream-03.ogg, goblin-scream-04.ogg"]
   license: "CC0-1.0"
-  copyright: "Original file made by Duisterwho (https://freesound.org/people/Duisterwho/), edited (cropped) by erhardsteinhauer (discord/github)"
+  copyright: "Original file made by Duisterwho (https://freesound.org/people/Duisterwho/), edited (converted to mono, cropped) by erhardsteinhauer (discord/github)"
   source: "https://freesound.org/people/Duisterwho/sounds/643497/"
 - files: ["goblin-cry-01.ogg, goblin-cry-02.ogg"]
   license: "CC0-1.0"
-  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (converted to mono, cropped) by erhardsteinhauer (discord/github)"
   source: https://freesound.org/people/SnowFightStudios/sounds/643657/
 - files: ["goblin-chatter-01.ogg"]
   license: "CC0-1.0"
-  copyright: "Original file made by Fenodyrie (https://freesound.org/people/Fenodyrie/)"
+  copyright: "Original file made by Fenodyrie (https://freesound.org/people/Fenodyrie/), edited (converted to mono) by erhardsteinhauer (discord/github)"
   source: https://freesound.org/people/Fenodyrie/sounds/565923/
 - files: ["goblin-hiss-01.ogg"]
   license: "CC-BY-4.0"
-  copyright: "Original file made by LittleRobotSoundFactory (https://freesound.org/people/LittleRobotSoundFactory/)"
+  copyright: "Original file made by LittleRobotSoundFactory (https://freesound.org/people/LittleRobotSoundFactory/), edited (converted to mono) by erhardsteinhauer (discord/github)"
   source: https://freesound.org/people/LittleRobotSoundFactory/sounds/270389/

Resources/Audio/_NF/Voice/Goblin/license.txt

@@ -1,32 +1,32 @@
 - files: ["goblin-cackle-01.ogg, goblin-cackle-02.ogg, goblin-cackle-03.ogg"]
   license: "CC0-1.0"
-  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (converted to mono, cropped, lowered amplitudes) by erhardsteinhauer (discord/github)"
   source: "https://freesound.org/people/SnowFightStudios/sounds/643664/"
 - files: ["goblin-cackle-04.ogg"]
   license: "CC0-1.0"
-  copyright: "Original file made by spookymodem (https://freesound.org/people/spookymodem/), edited (cropped) by erhardsteinhauer (discord/github)"
+  copyright: "Original file made by spookymodem (https://freesound.org/people/spookymodem/), edited (converted to mono, cropped) by erhardsteinhauer (discord/github)"
   source: "https://freesound.org/people/spookymodem/sounds/202096/"
 - files: ["goblin-cackle-05.ogg"]
-  license: "CC BY 4.0"
+  license: "CC-BY-4.0"
   copyright: "Original file made by Nanakisan (https://freesound.org/people/Nanakisan/)"
   source: "https://freesound.org/people/Nanakisan/sounds/253532/"
 - files: ["goblin-scream-01.ogg"]
   license: "CC0-1.0"
-  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (converted to mono, cropped) by erhardsteinhauer (discord/github)"
   source: "https://freesound.org/people/SnowFightStudios/sounds/643655/"
 - files: ["goblin-scream-02.ogg, goblin-scream-03.ogg, goblin-scream-04.ogg"]
   license: "CC0-1.0"
-  copyright: "Original file made by Duisterwho (https://freesound.org/people/Duisterwho/), edited (cropped) by erhardsteinhauer (discord/github)"
+  copyright: "Original file made by Duisterwho (https://freesound.org/people/Duisterwho/), edited (converted to mono, cropped) by erhardsteinhauer (discord/github)"
   source: "https://freesound.org/people/Duisterwho/sounds/643497/"
 - files: ["goblin-cry-01.ogg, goblin-cry-02.ogg"]
   license: "CC0-1.0"
-  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (converted to mono, cropped) by erhardsteinhauer (discord/github)"
   source: https://freesound.org/people/SnowFightStudios/sounds/643657/
 - files: ["goblin-chatter-01.ogg"]
   license: "CC0-1.0"
-  copyright: "Original file made by Fenodyrie (https://freesound.org/people/Fenodyrie/)"
+  copyright: "Original file made by Fenodyrie (https://freesound.org/people/Fenodyrie/), edited (converted to mono) by erhardsteinhauer (discord/github)"
   source: https://freesound.org/people/Fenodyrie/sounds/565923/
 - files: ["goblin-hiss-01.ogg"]
-  license: "CC BY 4.0"
-  copyright: "Original file made by LittleRobotSoundFactory (https://freesound.org/people/LittleRobotSoundFactory/)"
+  license: "CC-BY-4.0"
+  copyright: "Original file made by LittleRobotSoundFactory (https://freesound.org/people/LittleRobotSoundFactory/), edited (converted to mono) by erhardsteinhauer (discord/github)"
   source: https://freesound.org/people/LittleRobotSoundFactory/sounds/270389/

Resources/Changelog/Changelog.yml

@@ -4435,3 +4435,55 @@ Entries:
         cases.
   id: 4963
   time: '2024-04-29T21:36:47.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Fix
+      message: >-
+        All Jumpskirts in the game have been correctly listed as skirts, now
+        Harpies can wear them again. 
+  id: 4964
+  time: '2024-05-01T21:37:35.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Fix
+      message: >-
+        Fixed goblin stomach. Now it actually doesn't turn itself out when raw
+        meat or blood is consumed by owner of that stomach.
+    - type: Fix
+      message: Lowered sound level of goblin laughter sfx.
+  id: 4965
+  time: '2024-05-01T23:10:16.0000000+00:00'
+- author: blueDev2
+  changes:
+    - type: Add
+      message: Brigmedic PDAs can now perform medical scans
+  id: 4966
+  time: '2024-05-01T23:32:16.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Tweak
+      message: >-
+        Lower IFF amounts in Expeditionary Flatpackvend, you can now find many
+        IFF boards on planets.
+    - type: Tweak
+      message: >-
+        Added R&D Server Flatpack to Flatpackvend, removed the hidden HoverBike,
+        they can also be found on planets now.
+  id: 4967
+  time: '2024-05-02T01:07:48.0000000+00:00'
+- author: DeltaV
+  changes:
+    - type: Add
+      message: Felinids now scream in agony from water.
+    - type: Tweak
+      message: Felinid's thieving gloves have been removed for Soft paws mechanic.
+    - type: Add
+      message: Added a speech bubble to felinids. Mraow!
+  id: 4968
+  time: '2024-05-02T01:08:21.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Fix
+      message: Fixed mailpod power issue
+  id: 4969
+  time: '2024-05-02T01:21:52.0000000+00:00'

Resources/Maps/_NF/Shuttles/mailpod.yml

@@ -118,37 +118,19 @@ entities:
       data:
         tiles:
           0,0:
-            0: 1
-            1: 30582
-          -1,0:
-            2: 4
-            1: 52424
+            0: 4403
+            1: 17408
           0,-1:
-            1: 25975
-            3: 4096
-            0: 512
-          -1,-1:
-            1: 52428
+            0: 13106
+          -1,0:
+            0: 34944
           0,1:
-            1: 7
+            1: 4
+          -1,-1:
+            1: 17476
           -1,1:
-            1: 12
+            1: 4
         uniqueMixes:
-        - volume: 2500
-          temperature: 293.14996
-          moles:
-          - 20.078888
-          - 75.53487
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -165,10 +147,8 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.14996
+          immutable: True
           moles:
-          - 21.824879
-          - 82.10312
           - 0
           - 0
           - 0
@@ -179,19 +159,6 @@ entities:
           - 0
           - 0
           - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 23.710548
-          - 89.19683
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
           - 0
           - 0
         chunkSize: 4
@@ -330,24 +297,16 @@ entities:
     - type: Transform
       pos: 2.5,1.5
       parent: 1
-  - uid: 64
+  - uid: 32
     components:
     - type: Transform
-      pos: 2.5,2.5
+      pos: 1.5,1.5
       parent: 1
   - uid: 73
     components:
     - type: Transform
       pos: 1.5,2.5
       parent: 1
-- proto: CableTerminal
-  entities:
-  - uid: 32
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,1.5
-      parent: 1
 - proto: ChairOfficeLight
   entities:
   - uid: 58

Resources/Prototypes/DeltaV/typing_indicator.yml

@@ -0,0 +1,6 @@
+- type: typingIndicator
+  id: felinid
+  spritePath: /Textures/DeltaV/Effects/speech.rsi
+  typingState: felinid0
+  idleState: felinid1
+  offset: 0, 0.2 # 0625

Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml

@@ -36,6 +36,11 @@
   - type: Clothing
     slots: [innerclothing]
     femaleMask: UniformTop
+  - type: Tag
+    tags:
+    - ClothMade
+    - WhitelistChameleon
+    - Skirt #Frontier, needed for Harpies
 
 
 - type: entity