Demote status and show sec icons fix (#1091)

* demote status * try to fix showsecicons * fix mindshield
SerbiaStrong-220 · Jun 6, 2024 · 15bb291 · 15bb291
1 parent 6e04be8
commit 15bb291
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 4 deletions.
diff --git a/Content.Client/Overlays/ShowCriminalRecordIconsSystem.cs b/Content.Client/Overlays/ShowCriminalRecordIconsSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
+using Content.Shared.IdentityManagement.Components;
 using Content.Shared.Overlays;
 using Content.Shared.PDA;
 using Content.Shared.Security.Components;
@@ -20,10 +21,10 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<CriminalRecordComponent, GetStatusIconsEvent>(OnGetStatusIconsEvent);
+        SubscribeLocalEvent<IdentityComponent, GetStatusIconsEvent>(OnGetStatusIconsEvent); // 220 secincons fix
     }
 
-    private void OnGetStatusIconsEvent(EntityUid uid, CriminalRecordComponent component, ref GetStatusIconsEvent ev)
+    private void OnGetStatusIconsEvent(EntityUid uid, IdentityComponent _, ref GetStatusIconsEvent ev) // 220 secincons fix
     {
         if (!IsActive || ev.InContainer)
             return;

diff --git a/Resources/Locale/ru-RU/ss220/criminal-records/criminal-records.ftl b/Resources/Locale/ru-RU/ss220/criminal-records/criminal-records.ftl
@@ -13,8 +13,10 @@ criminal-status-wanted = В розыске
 criminal-status-search = Обыскать
 criminal-status-monitor = Следить
 criminal-status-execute = Казнить
+criminal-status-demote = Увольнение
 
 criminal-status-wanted-report = {$target} был объявлен в розыск! Причина: {$reason}
 criminal-status-execute-report = {$target} был приговорён к казни! Причина: {$reason}
+criminal-status-demote-report = {$target} в розыске для увольнения! Причина: {$reason}
 
 criminal-status-cooldown-popup = Вы пытаетесь добавлять записи слишком часто.
diff --git a/Resources/Prototypes/SS220/StatusEffects/sechud.yml b/Resources/Prototypes/SS220/StatusEffects/sechud.yml
@@ -1,8 +1,9 @@
 - type: statusIcon
   id: SecHudIcon
   abstract: true
-  priority: 2
+  priority: 3
   locationPreference: Right
+  isShaded: true
 
 - type: statusIcon
   parent: SecHudIcon
@@ -31,3 +32,10 @@
   icon:
     sprite: /Textures/SS220/Interface/Misc/sechud.rsi
     state: execute
+
+- type: statusIcon
+  parent: SecHudIcon
+  id: SecDemoteIcon
+  icon:
+    sprite: /Textures/SS220/Interface/Misc/sechud.rsi
+    state: demote
diff --git a/Resources/Prototypes/SS220/criminal_statuses.yml b/Resources/Prototypes/SS220/criminal_statuses.yml
@@ -22,4 +22,11 @@
   name: criminal-status-execute
   color: "#CC0000FF"
   statusIcon: SecExecuteIcon
-  radioReportMessage: criminal-status-execute-report
+  radioReportMessage: criminal-status-execute-report
+
+- type: criminalStatus
+  id: demote
+  name: criminal-status-demote
+  color: "#FF0000FF"
+  statusIcon: SecDemoteIcon
+  radioReportMessage: criminal-status-demote-report
diff --git a/Resources/Textures/SS220/Interface/Misc/sechud.rsi/demote.png b/Resources/Textures/SS220/Interface/Misc/sechud.rsi/demote.png
diff --git a/Resources/Textures/SS220/Interface/Misc/sechud.rsi/meta.json b/Resources/Textures/SS220/Interface/Misc/sechud.rsi/meta.json
@@ -20,6 +20,9 @@
         },
 		{
             "name": "monitor"
+        },
+		{
+            "name": "demote"
         }
     ]
 }