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

Mortician's Menagerie (#2391)

Browse Source 
* Body bags!

* Morgue Trays and the Crematorium!
Reorganised body bags to be under Morgue, not Medical

* Fix. Things outside of EntityStorageComponents now use the Try*Storage() not just *Storage() methods - Allows mobs to be trapped in a morgue/crematorium whose tray can't open.

* Fix tests. Modernise component dependency and nullability.

* Update Content.Server/GameObjects/Components/Morgue/MorgueTrayComponent.cs

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
This commit is contained in:
Remie Richards
2020-10-28 22:51:43 +00:00
committed by GitHub
parent 6a0aa9b72f
commit cc6acae145
38 changed files with 1225 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/GameObjects/Components/Paper/PaperComponent.cs
View File

@@ -16,8 +16,8 @@ namespace Content.Server.GameObjects.Components.Paper
[RegisterComponent]
public class PaperComponent : SharedPaperComponent, IExamine, IInteractUsing, IUse
{
private string _content = "";
private PaperAction _mode;
public string Content { get; private set; } = "";
[ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(PaperUiKey.Key);
@@ -35,7 +35,7 @@ namespace Content.Server.GameObjects.Components.Paper
}
private void UpdateUserInterface()
{
UserInterface?.SetState(new PaperBoundUserInterfaceState(_content, _mode));
UserInterface?.SetState(new PaperBoundUserInterfaceState(Content, _mode));
}
public void Examine(FormattedMessage message, bool inDetailsRange)
@@ -43,7 +43,7 @@ namespace Content.Server.GameObjects.Components.Paper
if (!inDetailsRange)
return;
message.AddMarkup(_content);
message.AddMarkup(Content);
}
public bool UseEntity(UseEntityEventArgs eventArgs)
@@ -63,7 +63,7 @@ namespace Content.Server.GameObjects.Components.Paper
if (string.IsNullOrEmpty(msg.Text))
return;
_content += msg.Text + '\n';
Content += msg.Text + '\n';
if (Owner.TryGetComponent(out SpriteComponent? sprite))
{