Merge pull request #94 from space-syndicate/upstream-sync

Upstream sync

Content.Server/Body/Systems/RespiratorSystem.cs

@@ -61,16 +61,19 @@ namespace Content.Server.Body.Systems
                 respirator.AccumulatedFrametime -= respirator.CycleDelay;
                 UpdateSaturation(respirator.Owner, -respirator.CycleDelay, respirator);
 
-                switch (respirator.Status)
+                if (!state.IsIncapacitated()) // cannot breathe in crit.
                 {
-                    case RespiratorStatus.Inhaling:
-                        Inhale(uid, body);
-                        respirator.Status = RespiratorStatus.Exhaling;
-                        break;
-                    case RespiratorStatus.Exhaling:
-                        Exhale(uid, body);
-                        respirator.Status = RespiratorStatus.Inhaling;
-                        break;
+                    switch (respirator.Status)
+                    {
+                        case RespiratorStatus.Inhaling:
+                            Inhale(uid, body);
+                            respirator.Status = RespiratorStatus.Exhaling;
+                            break;
+                        case RespiratorStatus.Exhaling:
+                            Exhale(uid, body);
+                            respirator.Status = RespiratorStatus.Inhaling;
+                            break;
+                    }
                 }
 
                 if (respirator.Saturation < respirator.SuffocationThreshold)

Content.Server/Throwing/ThrowHelper.cs

@@ -41,15 +41,9 @@ namespace Content.Server.Throwing
                 return;
             }
 
-            if (physicsComponent.BodyType == BodyType.Static)
+            if (physicsComponent.BodyType != BodyType.Dynamic)
             {
-                Logger.Warning("Tried to throw entity {entity} but can't throw static bodies!");
-                return;
-            }
-
-            if (entities.HasComponent<MobStateComponent>(entity))
-            {
-                Logger.Warning("Throwing not supported for mobs!");
+                Logger.Warning($"Tried to throw entity {entities.ToPrettyString(entity)} but can't throw {physicsComponent.BodyType} bodies!");
                 return;
             }
 

Resources/Changelog/Changelog.yml

@@ -1,23 +1,4 @@
 Entries:
-- author: Zumorica
-  changes:
-  - {message: Construction menu guides have been improved to be more accurate., type: Tweak}
-  id: 529
-  time: '2021-11-02T10:24:32.0000000+00:00'
-- author: Saphire
-  changes:
-  - {message: 'Make movement in space actually make sense, somewhat!', type: Add}
-  - {message: 'And make the camera not spaz out when you go into space. Still flips
-      around a bunch, but it isn''t jarring anymore!', type: Add}
-  - {message: 'Oh and spawning in won''t have your camera flipped around anymore for
-      a split second, either', type: Fix}
-  id: 530
-  time: '2021-11-02T13:35:02.0000000+00:00'
-- author: Mith-randalf
-  changes:
-  - {message: Changed some clothing item names., type: Tweak}
-  id: 531
-  time: '2021-11-02T18:37:51.0000000+00:00'
 - author: 20kdc
   changes:
   - {message: Rotating on barstools/etc. now works in more cases and rotates the right
@@ -2961,3 +2942,19 @@ Entries:
   - {message: Fixes youtool deny state, type: Fix}
   id: 1029
   time: '2022-02-10T02:00:57.0000000+00:00'
+- author: metalgearsloth
+  changes:
+  - {message: PAIs can now be yeeted., type: Add}
+  id: 1030
+  time: '2022-02-10T10:05:14.0000000+00:00'
+- author: Pancake
+  changes:
+  - {message: Angry bees., type: Add}
+  id: 1031
+  time: '2022-02-10T14:24:16.0000000+00:00'
+- author: ElectroJr
+  changes:
+  - {message: Mobs that need to breathe once again suffocate while in critical condition.,
+    type: Fix}
+  id: 1032
+  time: '2022-02-10T19:04:05.0000000+00:00'

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -87,6 +87,28 @@
     tags:
     - Bee
 
+- type: entity
+  name: bee
+  suffix: Angry
+  parent: MobBee
+  id: MobAngryBee
+  description: How nice a bee. Oh no, it looks angry and wants my pizza.
+  components:
+  - type: UnarmedCombat
+    range: 0.3
+    arcwidth: 0
+    arc: bite
+    damage:
+      types:
+        Poison: 2
+        Piercing: 1
+  - type: UtilityAI
+    behaviorSets:
+    - UnarmedAttackHostiles
+  - type: AiFactionTag
+    factions:
+    - SimpleHostile
+
 - type: entity
   name: chicken
   parent: SimpleMobBase

Resources/engineCommandPerms.yml

@@ -34,6 +34,7 @@
   - rmcompc
   - vv
   - scale
+  - spin
 
 - Flags: DEBUG
   Commands:

RobustToolbox

@@ -1 +1 @@
-Subproject commit 3f0fba7b4e1843c0a19ede6425c0d614f8dc8c27
+Subproject commit b540f04a7a50b7096cdd596bf3762ded795f96b9