Животных можно брать на руки, фелиниды еще легче

space-sunrise · Jan 17, 2025 · a691ef9 · a691ef9
1 parent 038b3c1
commit a691ef9
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 1 deletion.
diff --git a/Content.Server/_Sunrise/Carrying/CarryingSystem.cs b/Content.Server/_Sunrise/Carrying/CarryingSystem.cs
@@ -35,6 +35,8 @@ namespace Content.Server._Sunrise.Carrying
 {
     public sealed class CarryingSystem : EntitySystem
     {
+        private readonly float _maxThrowSpeed = 15f;
+
         [Dependency] private readonly SharedVirtualItemSystem _virtualItemSystem = default!;
         [Dependency] private readonly CarryingSlowdownSystem _slowdown = default!;
         [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
@@ -129,7 +131,9 @@ private void OnThrow(EntityUid uid, CarryingComponent component, BeforeThrowEven
 
             var multiplier = MassContest(uid, virtItem.BlockingEntity);
 
-            _throwingSystem.TryThrow(virtItem.BlockingEntity, args.Direction, 3f * multiplier, uid);
+            var throwSpeed = 3f * multiplier > _maxThrowSpeed ? _maxThrowSpeed : 3f * multiplier;
+
+            _throwingSystem.TryThrow(virtItem.BlockingEntity, args.Direction, throwSpeed, uid);
         }
 
         private void OnParentChanged(EntityUid uid, CarryingComponent component, ref EntParentChangedMessage args)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -239,6 +239,10 @@
   - type: NpcFactionMember
     factions:
     - Passive
+  # Sunrise-start
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 - type: entity
   parent: MobChicken
@@ -673,6 +677,10 @@
   - type: NpcFactionMember
     factions:
     - Passive
+  # Sunrise-start
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 - type: entity
   name: white duck #Quack
@@ -928,6 +936,10 @@
       task: RuminantCompound
   - type: Body
     prototype: AnimalHemocyanin
+  # Sunrise-start
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 - type: entity
   name: goat
@@ -1030,6 +1042,10 @@
   - type: HTN
     rootTask:
       task: RuminantHostileCompound
+  # Sunrise-start
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 # Note that we gotta make this bitch vomit someday when you feed it anthrax or sumthin. Needs to be a small item thief too and aggressive if attacked.
 - type: entity
@@ -1079,6 +1095,10 @@
   - type: NpcFactionMember
     factions:
     - Passive
+  # Sunrise-start
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 - type: entity
   name: gorilla
@@ -1382,6 +1402,10 @@
         Burn: 3
     clumsySound:
       path: /Audio/Animals/monkey_scream.ogg
+  # Sunrise-start
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 
 - type: entity
@@ -1965,6 +1989,10 @@
   - type: Tag
     tags:
     - VimPilot
+  # Sunrise-start
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 
 - type: entity
@@ -2189,6 +2217,10 @@
     heatDamage:
       types:
         Heat : 0.2 #per second, scales with temperature & other constants
+  # Sunrise-start
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 - type: entity
   name: grenade penguin
@@ -2410,6 +2442,8 @@
   - type: CollectiveMind
     minds:
     - Arachnids
+  - type: Carriable
+  - type: CanEscapeInventory
   # Sunrise-end
 
 - type: entity
@@ -2590,6 +2624,10 @@
   - type: Tag
     tags:
     - VimPilot
+  # Sunrise-start
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 - type: entity
   name: possum
@@ -2664,6 +2702,10 @@
   - type: Tag
     tags:
     - VimPilot
+  # Sunrise-start
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 - type: entity
   name: fox
@@ -2742,6 +2784,10 @@
   - type: Tag
     tags:
     - VimPilot
+  # Sunrise-start
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 - type: entity
   name: corgi
@@ -2803,6 +2849,10 @@
   - type: Tag
     tags:
     - VimPilot
+  # Sunrise-start
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 - type: entity
   name: corrupted corgi
@@ -2960,9 +3010,13 @@
   - type: Tag
     tags:
     - VimPilot
+  # Sunrise-start
   - type: NightVision #Sunrise - Night vision
     isToggle: true
     color: "#808080"
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 - type: entity
   name: calico cat
@@ -3178,6 +3232,10 @@
   - type: Tag
     tags:
     - VimPilot
+  # Sunrise-start
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 - type: entity
   name: ferret
@@ -3232,6 +3290,10 @@
   - type: Tag
     tags:
     - VimPilot
+  # Sunrise-start
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 - type: entity
   name: hamster
@@ -3449,6 +3511,8 @@
     # Sunrise-start
   - type: Body
     prototype: ManeaterAnimal
+  - type: Carriable
+  - type: CanEscapeInventory
     # Sunrise-end
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -267,6 +267,10 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalNamedCat
+  # Sunrise-start
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 - type: entity
   name: McGriff
@@ -327,6 +331,10 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalMcGriff
+  # Sunrise-start
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 - type: entity
   name: Paperwork
@@ -421,6 +429,10 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalWalter
+  # Sunrise-start
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 - type: entity
   name: Morty

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -112,6 +112,10 @@
     speechSounds: Slime
   - type: TypingIndicator
     proto: slime
+  # Sunrise-start
+  - type: Carriable
+  - type: CanEscapeInventory
+  # Sunrise-end
 
 - type: entity
   name: basic slime

diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml
@@ -95,6 +95,8 @@
   - type: MovementSpeedModifier
     baseWalkSpeed: 2.0
     baseSprintSpeed: 4.0
+  - type: Carriable
+    freeHandsRequired: 1
 #  - type: DamagedByFlashing
 #    flashDamage:
 #      types: