From e0308d091365ba4b23e74d45c5244b1288f611d5 Mon Sep 17 00:00:00 2001
From: Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
Date: Fri, 18 Apr 2025 03:23:02 +0200
Subject: [PATCH] Contraband examine changes (again) (#36032)

* g

* no one caught it in review, damn
---
 Content.Shared/Contraband/ContrabandSystem.cs |  19 +++++++-----------
 .../Examine/ExamineSystemShared.Group.cs      |   4 ++--
 .../Interface/VerbIcons/ATTRIBUTION.txt       |   4 ++--
 .../Textures/Interface/VerbIcons/lock-red.svg |   1 +
 .../VerbIcons/lock-red.svg.192dpi.png         | Bin 0 -> 2215 bytes
 .../VerbIcons/lock-red.svg.192dpi.png.yml     |   2 ++
 .../Interface/VerbIcons/unlock-green.svg      |   1 +
 .../VerbIcons/unlock-green.svg.192dpi.png     | Bin 0 -> 2152 bytes
 .../VerbIcons/unlock-green.svg.192dpi.png.yml |   2 ++
 9 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 Resources/Textures/Interface/VerbIcons/lock-red.svg
 create mode 100644 Resources/Textures/Interface/VerbIcons/lock-red.svg.192dpi.png
 create mode 100644 Resources/Textures/Interface/VerbIcons/lock-red.svg.192dpi.png.yml
 create mode 100644 Resources/Textures/Interface/VerbIcons/unlock-green.svg
 create mode 100644 Resources/Textures/Interface/VerbIcons/unlock-green.svg.192dpi.png
 create mode 100644 Resources/Textures/Interface/VerbIcons/unlock-green.svg.192dpi.png.yml

diff --git a/Content.Shared/Contraband/ContrabandSystem.cs b/Content.Shared/Contraband/ContrabandSystem.cs
index bfd7100289..c998875c87 100644
--- a/Content.Shared/Contraband/ContrabandSystem.cs
+++ b/Content.Shared/Contraband/ContrabandSystem.cs
@@ -84,26 +84,21 @@ public sealed class ContrabandSystem : EntitySystem
             }
         }
 
-        String carryingMessage;
-        // either its fully restricted, you have no departments, or your departments dont intersect with the restricted departments
+        // if it is fully restricted, you're department-less, or your department isn't in the allowed list, you cannot carry it. Otherwise, you can.
+        var carryingMessage = Loc.GetString("contraband-examine-text-avoid-carrying-around");
+        var iconTexture = "/Textures/Interface/VerbIcons/lock-red.svg.192dpi.png";
         if (departments.Intersect(component.AllowedDepartments).Any()
             || jobs.Contains(jobId))
         {
             carryingMessage = Loc.GetString("contraband-examine-text-in-the-clear");
+            iconTexture = "/Textures/Interface/VerbIcons/unlock-green.svg.192dpi.png";
         }
-        else
-        {
-            // otherwise fine to use :tm:
-            carryingMessage = Loc.GetString("contraband-examine-text-avoid-carrying-around");
-        }
-
         var examineMarkup = GetContrabandExamine(departmentExamineMessage, carryingMessage);
-        _examine.AddDetailedExamineVerb(args,
+        _examine.AddHoverExamineVerb(args,
             component,
-            examineMarkup,
             Loc.GetString("contraband-examinable-verb-text"),
-            "/Textures/Interface/VerbIcons/lock.svg.192dpi.png",
-            Loc.GetString("contraband-examinable-verb-message"));
+            examineMarkup.ToMarkup(),
+            iconTexture);
     }
 
     private FormattedMessage GetContrabandExamine(String deptMessage, String carryMessage)
diff --git a/Content.Shared/Examine/ExamineSystemShared.Group.cs b/Content.Shared/Examine/ExamineSystemShared.Group.cs
index 299d3c4af2..64b70d0af3 100644
--- a/Content.Shared/Examine/ExamineSystemShared.Group.cs
+++ b/Content.Shared/Examine/ExamineSystemShared.Group.cs
@@ -184,9 +184,9 @@ namespace Content.Shared.Examine
         /// <summary>
         ///     Adds an icon aligned to the left of examine window that gives you info on hover.
         /// </summary>
-        public void AddHoverExamineVerb(GetVerbsEvent<ExamineVerb> verbsEvent, Component component, string hoverMessage, string iconTexture = DefaultIconTexture)
+        public void AddHoverExamineVerb(GetVerbsEvent<ExamineVerb> verbsEvent, Component component, string verbText, string hoverMessage, string iconTexture = DefaultIconTexture)
         {
-            AddDetailedExamineVerb(verbsEvent, component, FormattedMessage.Empty, "", iconTexture, hoverMessage, true);
+            AddDetailedExamineVerb(verbsEvent, component, FormattedMessage.Empty, verbText, iconTexture, hoverMessage, true);
         }
     }
 }
diff --git a/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt b/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
index 1c71df2d5c..bb584a7c20 100644
--- a/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
+++ b/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
@@ -2,10 +2,10 @@ All icons are public domain.
 
 Pulled mostly from this source https://github.com/apancik/public-domain-icons.
 
-lock.svg by Lorc under CC BY 3.0
+lock.svg and lock-red.svg by Lorc under CC BY 3.0
 https://game-icons.net/1x1/lorc/padlock.html
 
-unlock.svg by Delapouite under CC BY 3.0
+unlock.svg and unlock-green by Delapouite under CC BY 3.0
 https://game-icons.net/1x1/delapouite/padlock-open.html
 
 bubbles.svg by Lorc under CC BY 3.0
diff --git a/Resources/Textures/Interface/VerbIcons/lock-red.svg b/Resources/Textures/Interface/VerbIcons/lock-red.svg
new file mode 100644
index 0000000000..ba2546dcab
--- /dev/null
+++ b/Resources/Textures/Interface/VerbIcons/lock-red.svg
@@ -0,0 +1 @@
+<svg style="height: 512px; width: 512px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><g class="" style="" transform="translate(0,0)"><path d="M254.28 17.313c-81.048 0-146.624 65.484-146.624 146.406V236h49.594v-69.094c0-53.658 43.47-97.187 97.03-97.187 53.563 0 97.032 44.744 97.032 97.186V236h49.594v-72.28c0-78.856-65.717-146.407-146.625-146.407zM85.157 254.688c-14.61 22.827-22.844 49.148-22.844 76.78 0 88.358 84.97 161.5 191.97 161.5 106.998 0 191.968-73.142 191.968-161.5 0-27.635-8.26-53.95-22.875-76.78H85.155zM254 278.625c22.34 0 40.875 17.94 40.875 40.28 0 16.756-10.6 31.23-25.125 37.376l32.72 98.126h-96.376l32.125-98.125c-14.526-6.145-24.532-20.62-24.532-37.374 0-22.338 17.972-40.28 40.312-40.28z" fill="#8b0000" fill-opacity="1" style="--darkreader-inline-fill: var(--darkreader-background-8b0000, #6f0000);" data-darkreader-inline-fill=""></path></g></svg>
\ No newline at end of file
diff --git a/Resources/Textures/Interface/VerbIcons/lock-red.svg.192dpi.png b/Resources/Textures/Interface/VerbIcons/lock-red.svg.192dpi.png
new file mode 100644
index 0000000000000000000000000000000000000000..0801b8c27900596d86f74a661872328dc27f438e
GIT binary patch
literal 2215
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Interface/VerbIcons/lock-red.svg.192dpi.png.yml b/Resources/Textures/Interface/VerbIcons/lock-red.svg.192dpi.png.yml
new file mode 100644
index 0000000000..5c43e23305
--- /dev/null
+++ b/Resources/Textures/Interface/VerbIcons/lock-red.svg.192dpi.png.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/Interface/VerbIcons/unlock-green.svg b/Resources/Textures/Interface/VerbIcons/unlock-green.svg
new file mode 100644
index 0000000000..83a61cca34
--- /dev/null
+++ b/Resources/Textures/Interface/VerbIcons/unlock-green.svg
@@ -0,0 +1 @@
+<svg style="height: 512px; width: 512px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><g class="" style="" transform="translate(0,0)"><path d="M402.6 164.6c0-78.92-65.7-146.47-146.6-146.47-81.1 0-146.6 65.49-146.6 146.47v72.3H159v-69.1c0-53.7 43.4-97.26 97-97.26 53.5 0 97 41.66 97 94.06zm-315.7 91C72.2 278.4 64 304.7 64 332.4c0 88.3 85 161.5 192 161.5s192-73.2 192-161.5c0-27.7-8.3-54-22.9-76.8zm168.8 23.9c22.3 0 40.9 18 40.9 40.3 0 16.8-10.6 31.2-25.1 37.3l32.7 98.2h-96.4l32.1-98.2c-14.5-6.1-24.5-20.6-24.5-37.3 0-22.3 18-40.3 40.3-40.3z" fill="#006400" fill-opacity="1" style="--darkreader-inline-fill: var(--darkreader-background-006400, #005000);" data-darkreader-inline-fill=""></path></g></svg>
\ No newline at end of file
diff --git a/Resources/Textures/Interface/VerbIcons/unlock-green.svg.192dpi.png b/Resources/Textures/Interface/VerbIcons/unlock-green.svg.192dpi.png
new file mode 100644
index 0000000000000000000000000000000000000000..baad170847fbd103cd17f56f19f6d5a9a9d19d9a
GIT binary patch
literal 2152
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
S`;KKu156DquqFDW$ln0vh5O?G

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Interface/VerbIcons/unlock-green.svg.192dpi.png.yml b/Resources/Textures/Interface/VerbIcons/unlock-green.svg.192dpi.png.yml
new file mode 100644
index 0000000000..5c43e23305
--- /dev/null
+++ b/Resources/Textures/Interface/VerbIcons/unlock-green.svg.192dpi.png.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
-- 
2.51.2