Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Nukes Iconcomponent (#2102)

Browse Source 
* pfew

* preview_state

* ship it

* weird stuff

* fucked up rebasing

* Update submodule

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
This commit is contained in:
Paul Ritter
2020-09-23 22:13:51 +02:00
committed by GitHub
parent 547290e3c2
commit d90c3295e6
203 changed files with 1501 additions and 3851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs
View File

@@ -109,11 +109,11 @@ namespace Content.Client.GameObjects.Components.Kitchen
{
return;
}
if (entity.Deleted || !entity.TryGetComponent(out IconComponent icon))
if (entity.Deleted || !entity.TryGetComponent(out SpriteComponent spriteComponent))
{
continue;
}
var solidItem = _menu.IngredientsList.AddItem(entity.Name, icon.Icon.Default);
var solidItem = _menu.IngredientsList.AddItem(entity.Name, spriteComponent.Icon);
var solidIndex = _menu.IngredientsList.IndexOf(solidItem);
_solids.Add(solidIndex, containedSolids[j]);

2
Content.Client/VendingMachines/VendingMachineMenu.cs
View File

@@ -50,7 +50,7 @@ namespace Content.Client.VendingMachines
Texture icon = null;
if(_prototypeManager.TryIndex(entry.ID, out EntityPrototype prototype))
{
icon = IconComponent.GetPrototypeIcon(prototype, _resourceCache).TextureFor(Direction.South);
icon = SpriteComponent.GetPrototypeIcon(prototype, _resourceCache);
}
_items.AddItem($"{itemName} ({entry.Amount} left)", icon);
}