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
///
/// Adds an icon aligned to the left of examine window that gives you info on hover.
///
- public void AddHoverExamineVerb(GetVerbsEvent verbsEvent, Component component, string hoverMessage, string iconTexture = DefaultIconTexture)
+ public void AddHoverExamineVerb(GetVerbsEvent 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 @@
+
\ 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 0000000000..0801b8c279
Binary files /dev/null and b/Resources/Textures/Interface/VerbIcons/lock-red.svg.192dpi.png differ
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 @@
+
\ 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 0000000000..baad170847
Binary files /dev/null and b/Resources/Textures/Interface/VerbIcons/unlock-green.svg.192dpi.png differ
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