tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve rotting examine text (#24689)

Browse Source
This commit is contained in:
Kara
2024-01-29 00:50:17 -07:00
committed by GitHub
parent ef6ca154e7
commit 1a74311c9f
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Atmos/Rotting/RottingSystem.cs
View File

@@ -133,7 +133,8 @@ public sealed class RottingSystem : SharedRottingSystem
return; return;
} }
var description = "perishable-" + stage; var isMob = HasComp<MobStateComponent>(perishable);
var description = "perishable-" + stage + (!isMob ? "-nonmob" : string.Empty);
args.PushMarkup(Loc.GetString(description, ("target", Identity.Entity(perishable, EntityManager)))); args.PushMarkup(Loc.GetString(description, ("target", Identity.Entity(perishable, EntityManager))));
} }

5
Content.Shared/Atmos/Rotting/SharedRottingSystem.cs
View File

@@ -1,5 +1,6 @@
using Content.Shared.Examine; using Content.Shared.Examine;
using Content.Shared.IdentityManagement; using Content.Shared.IdentityManagement;
using Content.Shared.Mobs.Components;
namespace Content.Shared.Atmos.Rotting; namespace Content.Shared.Atmos.Rotting;
@@ -34,6 +35,10 @@ public abstract class SharedRottingSystem : EntitySystem
>= 1 => "rotting-bloated", >= 1 => "rotting-bloated",
_ => "rotting-rotting" _ => "rotting-rotting"
}; };
if (!HasComp<MobStateComponent>(uid))
description += "-nonmob";
args.PushMarkup(Loc.GetString(description, ("target", Identity.Entity(uid, EntityManager)))); args.PushMarkup(Loc.GetString(description, ("target", Identity.Entity(uid, EntityManager))));
} }
} }

26
Resources/Locale/en-US/disease/miasma.ftl
View File

@@ -1,7 +1,21 @@
ammonia-smell = Something smells pungent! ammonia-smell = Something smells pungent!
perishable-1 = [color=green]{ CAPITALIZE(SUBJECT($target)) } still {CONJUGATE-BASIC($target, "look", "looks")} fresh.[/color]
perishable-2 = [color=orangered]{ CAPITALIZE(SUBJECT($target)) } {CONJUGATE-BASIC($target, "look", "looks")} somewhat fresh.[/color] ## Perishable
perishable-3 = [color=red]{ CAPITALIZE(SUBJECT($target)) } {CONJUGATE-BASIC($target, "do not", "doesn't")} {CONJUGATE-BASIC($target, "look", "looks")} fresh anymore.[/color]
rotting-rotting = [color=orange]{ CAPITALIZE(SUBJECT($target)) } {CONJUGATE-BE($target)} rotting![/color] perishable-1 = [color=green]{ CAPITALIZE(POSS-ADJ($target)) } corpse still looks fresh.[/color]
rotting-bloated = [color=orangered]{ CAPITALIZE(SUBJECT($target)) } {CONJUGATE-BE($target)} bloated![/color] perishable-2 = [color=orangered]{ CAPITALIZE(POSS-ADJ($target)) } corpse looks somewhat fresh.[/color]
rotting-extremely-bloated = [color=red]{ CAPITALIZE(SUBJECT($target)) } {CONJUGATE-BE($target)} extremely bloated![/color] perishable-3 = [color=red]{ CAPITALIZE(POSS-ADJ($target)) } corpse doesn't look very fresh.[/color]
perishable-1-nonmob = [color=green]{ CAPITALIZE(SUBJECT($target)) } still looks fresh.[/color]
perishable-2-nonmob = [color=orangered]{ CAPITALIZE(SUBJECT($target)) } looks somewhat fresh.[/color]
perishable-3-nonmob = [color=red]{ CAPITALIZE(SUBJECT($target)) } doesn't look very fresh.[/color]
## Rotting
rotting-rotting = [color=orange]{ CAPITALIZE(POSS-ADJ($target)) } corpse is rotting![/color]
rotting-bloated = [color=orangered]{ CAPITALIZE(POSS-ADJ($target)) } corpse is bloated![/color]
rotting-extremely-bloated = [color=red]{ CAPITALIZE(POSS-ADJ($target)) } corpse is extremely bloated![/color]
rotting-rotting-nonmob = [color=orange]{ CAPITALIZE(SUBJECT($target)) } is rotting![/color]
rotting-bloated-nonmob = [color=orangered]{ CAPITALIZE(SUBJECT($target)) } is bloated![/color]
rotting-extremely-bloated-nonmob = [color=red]{ CAPITALIZE(SUBJECT($target)) } is extremely bloated![/color]