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

Removes vending inventory desc and adds missing vending machine descriptions (#4493)

Browse Source 
* Removes inventory descriptions

* Adds missing vending machine descriptions using inventory descriptions

* Woops missed a file
This commit is contained in:
Swept
2021-08-19 22:23:02 -07:00
committed by GitHub
parent 45030b22a3
commit d2edd1712d
29 changed files with 17 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/VendingMachines/VendingMachineComponent.cs
View File

@@ -29,7 +29,7 @@ namespace Content.Server.VendingMachines
{
[RegisterComponent]
[ComponentReference(typeof(IActivate))]
public class VendingMachineComponent : SharedVendingMachineComponent, IActivate, IExamine, IBreakAct, IWires
public class VendingMachineComponent : SharedVendingMachineComponent, IActivate, IBreakAct, IWires
{
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -38,7 +38,6 @@ namespace Content.Server.VendingMachines
private TimeSpan _animationDuration = TimeSpan.Zero;
[DataField("pack")]
private string _packPrototypeId = string.Empty;
private string? _description;
private string _spriteName = "";
private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered;
@@ -81,7 +80,6 @@ namespace Content.Server.VendingMachines
}
Owner.Name = packPrototype.Name;
_description = packPrototype.Description;
_animationDuration = TimeSpan.FromSeconds(packPrototype.AnimationDuration);
_spriteName = packPrototype.SpriteName;
if (!string.IsNullOrEmpty(_spriteName))
@@ -162,12 +160,6 @@ namespace Content.Server.VendingMachines
}
}
public void Examine(FormattedMessage message, bool inDetailsRange)
{
if(_description == null) { return; }
message.AddText(_description);
}
private void TryEject(string id)
{
if (_ejecting || _broken)