AdventureTimeSS14 · Filokini · Nov 14, 2024 · Nov 5, 2024 · Nov 8, 2024 · Nov 10, 2024
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Human.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Human.yml
@@ -89,7 +89,7 @@
 
 - type: marking
   id: ADTMilkyEars
-  bodyPart: Head
+  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Human]
   sprites:
@@ -98,7 +98,7 @@
 
 - type: marking
   id: ADTMilkyHorns
-  bodyPart: Head
+  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human]
   sprites:

diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/Drask.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/Drask.yml
@@ -26,6 +26,8 @@
     color: "#4682B4FF"
     energy: 1
     radius: 1.2
+  - type: Prying
+    speedModifier: 0.4
   - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute.
     allowedStates:
     - Alive
@@ -67,9 +69,9 @@
         Heat : 0.6
   - type: TemperatureSpeed
     thresholds:
-      160: 0.8
-      140: 0.6
-      100: 0.4
+      40: 0.8
+      0: 0.6
+      -60: 0.4
   - type: SlowOnDamage
     speedModifierThresholds:
       62: 0.85

diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/Ursus.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/Ursus.yml
@@ -14,11 +14,16 @@
       0: Alive
       115: Critical
       250: Dead
+  - type: Barotrauma
+    damage:
+      types:
+        Blunt: 0.3
+        Heat: 0.05
   - type: Bloodstream
     bloodMaxVolume: 235
     bloodReagent: Blood
   - type: Hunger
-    baseDecayRate: 0.0983
+    baseDecayRate: 0.085
     thresholds:
       Overfed: 300
       Okay: 250

diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/kobolt.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/kobolt.yml
@@ -9,10 +9,10 @@
     species: KoboltSpecies
   - type: Hunger
   - type: Thirst
-  - type: Icon #
+  - type: Icon
     sprite: Mobs/Species/Reptilian/parts.rsi
     state: full
-  - type: Sprite #особенность кобольда. в будущем заменить на sizeAtribute
+  - type: Sprite
     netsync: false
     noRot: true
     drawdepth: Mobs
@@ -28,10 +28,10 @@
   - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute.
     allowedStates:
     - Alive
-    damageCap: 20
+    damageCap: 40
     damage:
       types:
-        Heat: -0.04
+        Heat: -0.06
         Cold: -0.04
       groups:
         Brute: -0.08

diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/novakid.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/novakid.yml
@@ -105,7 +105,7 @@
   - type: Barotrauma
     damage:
       types:
-        Blunt: 0.01 # Супер пониженный дамаг от давления
+        Blunt: 0.02 # Супер пониженный дамаг от давления
   - type: Reactive
     groups:
       Flammable: [ Touch ]
@@ -155,7 +155,6 @@
   - type: BloodCough
     postingSayDamage: blood-cough-novakid
 
-
 - type: entity
   save: false
   name: Urist McHands

diff --git a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml
@@ -131,7 +131,7 @@
   - StationEngineerBackpack
   - ADTEngineeringBelt
   - StationEngineerShoes
-  - Survival
+  - SurvivalExtended
   - Trinkets
   # ADT underwear tweak start
   - ADTTop

diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -58,7 +58,7 @@
     specificHeat: 42
     coldDamage:
       types:
-        Cold : 0.1 #per second, scales with temperature & other constants
+        Cold : 0.15 #per second, scales with temperature & other constants ADT tweak from 0.1 to 0.15
     heatDamage:
       types:
         Heat : 1.5 #per second, scales with temperature & other constants
@@ -102,6 +102,10 @@
         Cold: -0.06
       groups:
         Brute: -0.08
+  - type: SlowOnDamage
+    speedModifierThresholds:
+      55: 0.8
+      75: 0.7
   - type: Fixtures
     fixtures:
       fix1:

diff --git a/Resources/Prototypes/ai_factions.yml b/Resources/Prototypes/ai_factions.yml
@@ -7,6 +7,7 @@
     - PetsNT
     - Zombie
     - Revolutionary
+    - Ursus # ADT tweak
 
 - type: npcFaction
   id: NanoTrasen
@@ -43,6 +44,7 @@
   - PetsNT
   - Zombie
   - Revolutionary
+  - Ursus # ADT tweak
 
 - type: npcFaction
   id: SimpleNeutral
@@ -56,6 +58,7 @@
   - PetsNT
   - Zombie
   - DroneAntag # ADT tweak
+  - Ursus # ADT tweak
 
 - type: npcFaction
   id: Xeno
@@ -66,6 +69,7 @@
   - PetsNT
   - Zombie
   - Revolutionary
+  - Ursus # ADT tweak
 
 - type: npcFaction
   id: Zombie
@@ -77,6 +81,7 @@
   - Passive
   - PetsNT
   - Revolutionary
+  - Ursus # ADT tweak
 
 - type: npcFaction
   id: Revolutionary
@@ -85,3 +90,4 @@
   - Zombie
   - SimpleHostile
   - Dragon
+  - Ursus # ADT tweak
diff --git a/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_tail.png b/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_tail.png
diff --git a/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_tail_secondary.png b/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_tail_secondary.png