Merge branch 'master' of https://github.com/Guloveos/arc-station-14

The-Arcadis-Team · Jan 13, 2025 · de487ae · de487ae
2 parents d4fe397 + 5e501bc
commit de487ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Resources/Prototypes/Entities/Arcadis_station/NPCs/creaturefeature.yml b/Resources/Prototypes/Entities/Arcadis_station/NPCs/creaturefeature.yml
@@ -23,8 +23,8 @@
     damageContainer: Biological
     damageModifierSet: HellSpawn
   - type: MovementSpeedModifier
-    baseWalkSpeed: 3
-    baseSprintSpeed: 5.5
+    baseWalkSpeed: 5
+    baseSprintSpeed: 8
   - type: Sprite
     sprite: Arcadis_station/NPC/creaturefeature.rsi
     layers:
@@ -40,8 +40,8 @@
     group: GenericNumber
   - type: SlowOnDamage
     speedModifierThresholds:
-      60: 0.7
-      80: 0.5
+      700: 0.7
+      780: 0.5
   - type: MobPrice
     price: 1000 # Living critters are valuable in space.
   - type: Perishable
@@ -80,7 +80,7 @@
     damage:
       types:
         Slash: 70
-        Structural: 70
+        Structural: 150
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepThud
diff --git a/Resources/Prototypes/Entities/Arcadis_station/Structures/Misc/erpdobe.yml b/Resources/Prototypes/Entities/Arcadis_station/Structures/Misc/erpdobe.yml
@@ -33,3 +33,4 @@
     UniformSchoolgirlOrange: 2
     UniformSchoolgirlPink: 2
     UniformSchoolgirlPurple: 2
+    ClothingBackpackDuffelSyndiegirl: 2