People who get creamed while they were already creamed get stunned again.
This commit is contained in:
@@ -22,6 +22,8 @@ namespace Content.Server.GameObjects.Components.Nutrition
|
|||||||
get => _creamPied;
|
get => _creamPied;
|
||||||
private set
|
private set
|
||||||
{
|
{
|
||||||
|
if (value == _creamPied) return;
|
||||||
|
|
||||||
_creamPied = value;
|
_creamPied = value;
|
||||||
if (Owner.TryGetComponent(out AppearanceComponent? appearance))
|
if (Owner.TryGetComponent(out AppearanceComponent? appearance))
|
||||||
{
|
{
|
||||||
@@ -51,7 +53,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
|
|||||||
|
|
||||||
void IThrowCollide.HitBy(ThrowCollideEventArgs eventArgs)
|
void IThrowCollide.HitBy(ThrowCollideEventArgs eventArgs)
|
||||||
{
|
{
|
||||||
if (CreamPied || eventArgs.Thrown.Deleted || !eventArgs.Thrown.TryGetComponent(out CreamPieComponent? creamPie)) return;
|
if (eventArgs.Thrown.Deleted || !eventArgs.Thrown.TryGetComponent(out CreamPieComponent? creamPie)) return;
|
||||||
|
|
||||||
CreamPied = true;
|
CreamPied = true;
|
||||||
Owner.PopupMessage(Loc.GetString("You have been creamed by {0:theName}!", eventArgs.Thrown));
|
Owner.PopupMessage(Loc.GetString("You have been creamed by {0:theName}!", eventArgs.Thrown));
|
||||||
|
|||||||
Reference in New Issue
Block a user