Всякое (#213)
* - tweak: Shotgun firerate standartization.
* - tweak: Less storage clothing size.
* - tweak: No spears for nukies.
* - tweak: Slightly buff ling armor.
* - tweak: Nerf tranquilizers.
* Revert "Tranquilizer balance (#23979)"
This reverts commit 9e1342f3e4.
* - remove: Disable whisper aspect.
* - fix: Borer fix on transform person.
* - fix: Items no longer get dropped on transform.
* - tweak: Reduce ling tentacle stun time.
* - tweak: Update chitinous armor desc.
* - fix: Transform sting range check.
* - tweak: More explosion resistance.
* - tweak: Fuel tanks can't create vacuum.
* - fix: Fix transform while being carried.
* - fix: Monkey form.
* - fix: I have no brain but I must live.
* - tweak: Update ling desc.
* - tweak: Fleshmend heals airloss.
* - fix: New wiki rules.
* - fix: Fix missing polymorph.
* - tweak: Structural damage now works better.
* - tweak: Less reflect prob.
* - fix: Popup fix.
This commit is contained in:
@@ -2,6 +2,7 @@ using Content.Server.Body.Systems;
|
||||
using Content.Shared.Body.Organ;
|
||||
using Content.Shared.Construction;
|
||||
using Content.Shared._White.CheapSurgery;
|
||||
using Content.Shared.Changeling;
|
||||
|
||||
namespace Content.Server._White.Construction.Completions;
|
||||
|
||||
@@ -20,7 +21,8 @@ public sealed partial class Surgery : IGraphAction
|
||||
return;
|
||||
}
|
||||
|
||||
if (entityManager.TryGetComponent<OrganComponent>(surgeryComponent.OrganUid, out var organComponent))
|
||||
if (entityManager.TryGetComponent<OrganComponent>(surgeryComponent.OrganUid, out var organComponent) &&
|
||||
!entityManager.HasComponent<ChangelingComponent>(uid))
|
||||
bodySystem.RemoveOrgan(surgeryComponent.OrganUid, organComponent);
|
||||
|
||||
entityManager.RemoveComponent<ActiveSurgeryComponent>(uid);
|
||||
|
||||
@@ -67,7 +67,7 @@ public sealed class CritSystem : EntitySystem
|
||||
args.BonusDamage = new DamageSpecifier(_prototypeManager.Index<DamageTypePrototype>("Slash"),
|
||||
damage - args.BaseDamage.GetTotal());
|
||||
|
||||
_popup.PopupEntity($@"Crit! {damage}", args.User, PopupType.MediumCaution);
|
||||
_popup.PopupEntity($"Crit! {damage}", args.User, args.User, PopupType.MediumCaution);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user