Ремув попапа сна (#146)
* remove: remove ZZZ popup * fix: client popup for target doll
This commit is contained in:
@@ -69,7 +69,6 @@ namespace Content.Server.Bed.Sleep
|
||||
emitSound.Sound = sleepSound.Snore;
|
||||
emitSound.PlayChance = sleepSound.Chance;
|
||||
emitSound.RollInterval = sleepSound.Interval;
|
||||
emitSound.PopUp = sleepSound.PopUp;
|
||||
}
|
||||
|
||||
return;
|
||||
|
||||
@@ -30,7 +30,12 @@ public sealed class DamagePopupSystem : EntitySystem
|
||||
DamagePopupType.Hit => "!",
|
||||
_ => "Invalid type",
|
||||
};
|
||||
_popupSystem.PopupEntity(msg, uid);
|
||||
|
||||
if (args.Origin.HasValue)
|
||||
_popupSystem.PopupEntity(msg, uid, args.Origin.Value);
|
||||
else
|
||||
_popupSystem.PopupEntity(msg, uid);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,10 +22,4 @@ public sealed partial class SleepEmitSoundComponent : Component
|
||||
/// </summary>
|
||||
[DataField, ViewVariables(VVAccess.ReadWrite)]
|
||||
public float Chance = 0.33f;
|
||||
|
||||
/// <summary>
|
||||
/// Popup for snore (e.g. Zzz...)
|
||||
/// </summary>
|
||||
[DataField, ViewVariables(VVAccess.ReadWrite)]
|
||||
public LocId PopUp = "sleep-onomatopoeia";
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
action-name-wake = Wake up
|
||||
|
||||
sleep-onomatopoeia = Zzz...
|
||||
sleep-examined = [color=lightblue]{CAPITALIZE(SUBJECT($target))} {CONJUGATE-BE($target)} asleep.[/color]
|
||||
|
||||
wake-other-success = You shake {THE($target)} awake.
|
||||
|
||||
@@ -2,7 +2,6 @@ action-name-sleep = Спать
|
||||
action-desc-sleep = Лечь спать.
|
||||
action-name-wake = Проснуться
|
||||
action-desc-wake = Перестать спать.
|
||||
sleep-onomatopoeia = Zzz...
|
||||
sleep-examined = [color=lightblue]{ CAPITALIZE($target) } спит.[/color]
|
||||
wake-other-success = Вы разбудили { $target }.
|
||||
wake-other-failure = Вы тормошите { $target }, но { $target } не просыпается.
|
||||
|
||||
Reference in New Issue
Block a user