diff --git a/Resources/Prototypes/_Sunrise/Damage/modifier_sets.yml b/Resources/Prototypes/_Sunrise/Damage/modifier_sets.yml index 79c8d08478..b385d76645 100644 --- a/Resources/Prototypes/_Sunrise/Damage/modifier_sets.yml +++ b/Resources/Prototypes/_Sunrise/Damage/modifier_sets.yml @@ -11,12 +11,11 @@ - type: damageModifierSet id: Felinid coefficients: - Blunt: 1.5 - Piercing: 1.5 - Slash: 1.5 - Cold: 1.5 - Heat: 1.5 - Poison: 1.5 + Blunt: 1.3 + Piercing: 1.3 + Slash: 1.3 + Cold: 1.3 + Heat: 1.3 - type: damageModifierSet id: Swine diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml index 21207bf5bd..b475ea99c2 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml @@ -8,15 +8,6 @@ - type: OwOAccent - type: Speech speechVerb: Felinid - - type: SlowOnDamage - speedModifierThresholds: - 25: 0.7 - 50: 0.5 - - type: MobThresholds - thresholds: - 0: Alive - 75: Critical - 150: Dead - type: Thieving stealthy: true stripTimeReduction: 1 @@ -55,7 +46,7 @@ - type: DamageOnHighSpeedImpact damage: types: - Blunt: 25 + Blunt: 5 soundHit: path: /Audio/Effects/hit_kick.ogg - type: Stamina @@ -68,10 +59,10 @@ - type: Respirator damage: types: - Asphyxiation: 2.5 + Asphyxiation: 1.5 damageRecovery: types: - Asphyxiation: -2.5 + Asphyxiation: -1.5 - type: NpcFactionMember factions: - NanoTrasen diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/synth.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/synth.yml index d75c76b0b3..d5dda9c60b 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/synth.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/synth.yml @@ -93,7 +93,6 @@ sprite: _Sunrise/Mobs/Species/Synth/parts.rsi state: full - type: Stamina - critThreshold: 150 - type: Sprite noRot: true drawdepth: Mobs @@ -165,7 +164,7 @@ canResistFire: true damage: types: - Heat: 0.15 #per second, scales with number of fire 'stacks' + Heat: 1 #per second, scales with number of fire 'stacks' - type: Temperature heatDamageThreshold: 1000 coldDamageThreshold: 0 @@ -176,7 +175,7 @@ Cold: 0 heatDamage: types: - Heat: 1.5 #per second, scales with temperature & other constants + Heat: 1 #per second, scales with temperature & other constants - type: HumanoidAppearance species: Synth - type: Body @@ -252,7 +251,7 @@ attackRate: 1 damage: types: - Blunt: 5 + Blunt: 8 - type: Pullable - type: DoAfter - type: CreamPied @@ -306,12 +305,11 @@ - type: Synth - type: Repairable doAfterDelay: 3 - selfRepairPenalty: 1 damage: types: - Blunt: -10 - Slash: -10 - Piercing: -10 + Blunt: -5 + Slash: -5 + Piercing: -5 - type: EyeProtection - type: entity diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/nanopaste.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/nanopaste.yml index bd53d52f7e..1f6d2a4a9b 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/nanopaste.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/nanopaste.yml @@ -19,11 +19,11 @@ - Silicon damage: types: - Heat: -15 - Shock: -15 - Blunt: -15 - Slash: -15 - Piercing: -15 + Heat: -10 + Shock: -10 + Blunt: -10 + Slash: -10 + Piercing: -10 healingBeginSound: path: "/Audio/Items/Medical/ointment_begin.ogg" healingEndSound: