Browse Source

Resolving several issues (#181)

* spear container and wild yarrow fix

* fixes impassible water for bullets

* more fixes

* increases food and thirst rates

* angle fixes

* bear sprite fix

* drop items from hands when sleeping

* pencil sound

* some  more fixes

* yaml fix
Taislin 7 tháng trước cách đây
mục cha
commit
b774363ebe

+ 2 - 0
Content.Shared/Bed/Sleep/SleepingSystem.cs

@@ -25,6 +25,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Content.Shared.Civ14.SleepZone;
+using Content.Shared.Standing;
 
 namespace Content.Shared.Bed.Sleep;
 
@@ -270,6 +271,7 @@ public bool TrySleeping(Entity<MobStateComponent?> ent)
         RaiseLocalEvent(ent.Owner, ref tryingToSleepEvent); // Use EntityUid (ent.Owner)
         if (tryingToSleepEvent.Cancelled)
             return false;
+        RaiseLocalEvent(ent.Owner, new DropHandItemsEvent(), false);
         // Specific logic if the entity also has a SleepZoneComponent.
         // Use TryComp with the original Entity<T> struct 'ent'.
         if (TryComp<SleepZoneComponent>(ent, out var sleepZone))

+ 1 - 1
Resources/Prototypes/Civ14/Entities/Mobs/predators.yml

@@ -16,7 +16,7 @@
       fixtures:
         fix1:
           shape: !type:PhysShapeCircle
-            radius: 0.4
+            radius: 0.65
           density: 150
           mask:
             - MobMask

+ 2 - 2
Resources/Prototypes/Entities/Objects/Decoration/flora.yml

@@ -42,14 +42,14 @@
       noRot: true
       sprite: Objects/Decoration/Flora/flora_trees.rsi
       drawdepth: Overdoors
-      offset: 0,0.9
+      offset: 0,0.5
     - type: Physics
       bodyType: Static
     - type: Fixtures
       fixtures:
         fix1:
           shape: !type:PhysShapeAabb
-            bounds: "-0.35,-0.4,0.35,0.4"
+            bounds: "-0.4,-0.4,0.4,0.4"
           density: 1000
           layer:
             - WallLayer

+ 0 - 6
Resources/Prototypes/Entities/Objects/Misc/pen.yml

@@ -18,12 +18,6 @@
     - type: PhysicalComposition
       materialComposition:
         Steel: 25
-    - type: EmitSoundOnUse
-      sound:
-        path: /Audio/Items/pen_click.ogg
-        params:
-          volume: -4
-          maxDistance: 2
     - type: UseDelay
       delay: 1.5
 

+ 0 - 2
Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml

@@ -674,8 +674,6 @@
       delay: 0.5
     - type: StaticPrice # A new shitcurity meta
       price: 75
-    - type: EmitSoundOnUse
-      handle: false # don't want the sound to stop the self-inject from triggering
 
 - type: entity
   parent: [BaseItem, BaseSyndicateContraband]

+ 0 - 2
Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml

@@ -20,8 +20,6 @@
     - type: DeviceLinkSink
       ports:
         - Trigger
-    - type: EmitSoundOnUse
-      handle: false # don't want the sound to stop the explosion from triggering
 
 - type: entity
   parent: [BaseItem, BaseSyndicateContraband]

+ 6 - 4
Resources/Prototypes/Entities/Tiles/water.yml

@@ -85,12 +85,13 @@
           shape: !type:PhysShapeAabb
             bounds: "-0.5,-0.5,0.5,0.5"
           density: 100
+          hard: true
           mask:
+            - LowImpassable
             - MidImpassable
-            - HighImpassable
           layer:
+            - LowImpassable
             - MidImpassable
-            - HighImpassable
     - type: Tag
       tags:
         - Water
@@ -112,12 +113,13 @@
           shape: !type:PhysShapeAabb
             bounds: "-0.5,-0.5,0.5,0.5"
           density: 100
+          hard: true
           mask:
+            - LowImpassable
             - MidImpassable
-            - HighImpassable
           layer:
+            - LowImpassable
             - MidImpassable
-            - HighImpassable
     - type: Tag
       tags:
         - Water

BIN
Resources/Textures/Civ14/Mobs/animal_64.rsi/brownbear.png