Merge remote-tracking branch 'upstream/master'

2024-06-03 19:54:40 +03:00
parent 6da017daff f222c5ffc4
commit d2b24c049d
104 changed files with 2329 additions and 184889 deletions
--- a/Resources/Textures/White/Interface/securityhud.rsi/discharged.png
+++ b/Resources/Textures/White/Interface/securityhud.rsi/discharged.png
--- a/Resources/Textures/White/Interface/securityhud.rsi/incarcerated.png
+++ b/Resources/Textures/White/Interface/securityhud.rsi/incarcerated.png
--- a/Resources/Textures/White/Interface/securityhud.rsi/meta.json
+++ b/Resources/Textures/White/Interface/securityhud.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+	"license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/blob/8e49222b72f6fdcbe741d2a6ce0a8425d95010b7/icons/mob/huds/hud.dmi",
+    "version": 1,
+    "size": { "y": 32, "x": 32 },
+    "states": [
+        {
+            "name": "wanted"
+        },
+        {
+            "name": "suspected"
+        },
+        {
+            "name": "released"
+        },
+        {
+            "name": "incarcerated"
+        },
+        {
+            "name": "remove"
+        }
+    ]
+}
--- a/Resources/Textures/White/Interface/securityhud.rsi/paroled.png
+++ b/Resources/Textures/White/Interface/securityhud.rsi/paroled.png
--- a/Resources/Textures/White/Interface/securityhud.rsi/released.png
+++ b/Resources/Textures/White/Interface/securityhud.rsi/released.png
--- a/Resources/Textures/White/Interface/securityhud.rsi/remove.png
+++ b/Resources/Textures/White/Interface/securityhud.rsi/remove.png
--- a/Resources/Textures/White/Interface/securityhud.rsi/suspected.png
+++ b/Resources/Textures/White/Interface/securityhud.rsi/suspected.png
--- a/Resources/Textures/White/Interface/securityhud.rsi/wanted.png
+++ b/Resources/Textures/White/Interface/securityhud.rsi/wanted.png