]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Ghetto Mindshield Icon (#20958)
authorcoolmankid12345 <55817627+coolmankid12345@users.noreply.github.com>
Sat, 2 Dec 2023 17:21:10 +0000 (12:21 -0500)
committerGitHub <noreply@github.com>
Sat, 2 Dec 2023 17:21:10 +0000 (12:21 -0500)
* Looks like shit frfr

* White for sure

* New icon

---------

Co-authored-by: coolmankid12345 <coolmankid12345@users.noreply.github.com>
Content.Client/Overlays/ShowSecurityIconsSystem.cs
Content.Shared/Mindshield/Components/MindShieldComponent.cs
Resources/Prototypes/StatusIcon/antag.yml
Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png [new file with mode: 0644]
Resources/Textures/Interface/Misc/job_icons.rsi/meta.json

index cbf8044a60f81122b90f8dcd31e38eec4efefb9e..28984c6f7a8bb0e029a0d3b10ff06088855b82cb 100644 (file)
@@ -1,5 +1,6 @@
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
+using Content.Shared.Mindshield.Components;
 using Content.Shared.Overlays;
 using Content.Shared.PDA;
 using Content.Shared.StatusIcon;
@@ -66,6 +67,12 @@ public sealed class ShowSecurityIconsSystem : EquipmentHudSystem<ShowSecurityIco
         else
             Log.Error($"Invalid job icon prototype: {jobIcon}");
 
+        if (TryComp<MindShieldComponent>(uid, out var comp))
+        {
+            if (_prototypeMan.TryIndex<StatusIconPrototype>(comp.MindShieldStatusIcon.Id, out var icon))
+                result.Add(icon);
+        }
+
         // Add arrest icons here, WYCI.
 
         return result;
index 1cc21d14bd6b5726d88ed6b2ad022d2f7a7f33c2..235862ed02dc789ee451ffc36f9cc0376c6be919 100644 (file)
@@ -1,5 +1,7 @@
 using Content.Shared.Revolutionary;
 using Robust.Shared.GameStates;
+using Content.Shared.StatusIcon;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Mindshield.Components;
 
@@ -9,4 +11,6 @@ namespace Content.Shared.Mindshield.Components;
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedRevolutionarySystem))]
 public sealed partial class MindShieldComponent : Component
 {
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public ProtoId<StatusIconPrototype> MindShieldStatusIcon = "MindShieldIcon";
 }
index 6016d0c94eb94e47ebaf68e936db61e5d08cc1df..a3fb07272277b2748dfa7bfb50a2fbe71533ace5 100644 (file)
     sprite: Interface/Misc/job_icons.rsi
     state: HeadRevolutionary
 
+- type: statusIcon
+  id: MindShieldIcon
+  priority: 2
+  locationPreference: Right
+  icon:
+    sprite: Interface/Misc/job_icons.rsi
+    state: MindShield
+    
 - type: statusIcon
   id: SyndicateFaction
   priority: 0
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png b/Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png
new file mode 100644 (file)
index 0000000..3049f3e
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png differ
index 8a710b63ecdac5a6eb0e8b864517918660a960bb..da00077fbd8e91475ae9e37676f21b9f1ee6452f 100644 (file)
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon made by Psychpsyo (Github)",
 
     "size": {
         "x": 8,
         {
             "name": "HeadRevolutionary"
         },
+        {
+            "name": "MindShield"
+        },
         {
             "name": "Syndicate"
         }