change a bit 3

Space-Stories · Nov 16, 2024 · 725183b · 725183b
1 parent ae50675
commit 725183b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Content.Server/Stories/Garrote/GarroteSystem.cs b/Content.Server/Stories/Garrote/GarroteSystem.cs
@@ -57,7 +57,7 @@ private void OnGarroteAttempt(EntityUid uid, GarroteComponent comp, ref AfterInt
             return;
         }
 
-        if (!(mobstate.CurrentState == MobState.Alive && TryComp<RespiratorComponent>(args.Target, out var respirator)))
+        if (!(mobstate.CurrentState == MobState.Alive && HasComp<RespiratorComponent>(args.Target)))
         {
             var message = Loc.GetString("garrote-component-doesnt-breath", ("target", args.Target));
             _popupSystem.PopupEntity(message, uid, args.User);
@@ -101,9 +101,6 @@ private void OnGarroteAttempt(EntityUid uid, GarroteComponent comp, ref AfterInt
             AddComp<MutedComponent>(args.Target.Value);
         }
 
-        var saturationDelta = respirator.MinSaturation - respirator.Saturation;
-        _respirator.UpdateSaturation(args.Target.Value, saturationDelta, respirator);
-
         comp.Busy = true;
     }
 
@@ -137,7 +134,9 @@ private void OnGarroteDone(EntityUid uid, GarroteComponent comp, GarroteDoneEven
 
         if (args.Cancelled || mobstate.CurrentState != MobState.Alive) return;
 
-        var damage = _mobThresholdSystem.GetThresholdForState(args.Target.Value, MobState.Critical, thresholds) - damageable.TotalDamage;
+        var critthreshold = _mobThresholdSystem.GetThresholdForState(args.Target.Value, MobState.Critical, thresholds);
+        var deadthreshold = _mobThresholdSystem.GetThresholdForState(args.Target.Value, MobState.Dead, thresholds);
+        var damage = critthreshold + 0.1 * (deadthreshold - critthreshold) - damageable.TotalDamage;
         DamageSpecifier damageDealt = new(_prototypeManager.Index<DamageTypePrototype>("Asphyxiation"), damage);
         _damageable.TryChangeDamage(args.Target, damageDealt, false, origin: args.User);
 

diff --git a/Resources/Prototypes/Stories/Entities/Objects/Weapons/Special/garrote.yml b/Resources/Prototypes/Stories/Entities/Objects/Weapons/Special/garrote.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: BaseItem
   id: Garrote
-  name: Удавка
+  name: удавка
   description: Приспособление, используемое не иначе, как для скрытных убийств.
   components:
   - type: Sprite