git.smokeofanarchy.ru Git - space-station-14.git/commit

author	Golinth <amh2023@gmail.com>
	Fri, 16 Feb 2024 15:58:28 +0000 (09:58 -0600)
committer	GitHub <noreply@github.com>
	Fri, 16 Feb 2024 15:58:28 +0000 (10:58 -0500)
commit	bced73f67657246bc167531414ea0be5a5bba6bf
tree	f645235a43424ffd2082de5cf51dcf04872cbf55	tree \| snapshot
parent	0a64e086c4049fe6d3d9399f55bb337f0e72e2ed	commit \| diff

Kill Seperated Mindshield Icons (#25303)

* Unghettoify mindshield icons

Adds support for layers in status icons, through the StatusIconLayer enum and the new "layer" datafield. Defaults to the Base layer where functionally remains unchanged.

* TG icon for shield

probably better than the shitty one I made in paint

* forgor meta.json

I forgor

* Emo review

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

Content.Client/StatusIcon/StatusIconOverlay.cs		diff \| blob \| history
Content.Shared/StatusIcon/StatusIconPrototype.cs		diff \| blob \| history
Resources/Prototypes/StatusIcon/antag.yml		diff \| blob \| history
Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png		diff \| blob \| history
Resources/Textures/Interface/Misc/job_icons.rsi/meta.json		diff \| blob \| history