From 3a4484b702816be32ffee785310e9215094428a4 Mon Sep 17 00:00:00 2001
From: Tiniest Shark <head.rebel@yahoo.com>
Date: Tue, 9 Dec 2025 04:33:04 -0500
Subject: [PATCH] Add paper labels to gas canisters (#41737)

* paper? on canisters? are you KIDDING

* woops forgot something

* I think this'll fix the errors?
---
 .../Storage/Canisters/gas_canisters.yml       |  27 ++
 .../Storage/canister.rsi/bounty.png           | Bin 0 -> 211 bytes
 .../Storage/canister.rsi/captains_paper.png   | Bin 0 -> 214 bytes
 .../Storage/canister.rsi/invoice.png          | Bin 0 -> 215 bytes
 .../Structures/Storage/canister.rsi/meta.json | 252 +++++++++---------
 .../Structures/Storage/canister.rsi/paper.png | Bin 0 -> 203 bytes
 6 files changed, 159 insertions(+), 120 deletions(-)
 create mode 100644 Resources/Textures/Structures/Storage/canister.rsi/bounty.png
 create mode 100644 Resources/Textures/Structures/Storage/canister.rsi/captains_paper.png
 create mode 100644 Resources/Textures/Structures/Storage/canister.rsi/invoice.png
 create mode 100644 Resources/Textures/Structures/Storage/canister.rsi/paper.png

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index b37d3d4c4d..3bacc4442b 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -14,6 +14,9 @@
       noRot: true
       layers:
         - state: grey
+        - state: paper
+          visible: false
+          map: [ "enum.PaperLabelVisuals.Layer" ]
     - type: Appearance
     - type: GenericVisualizer
       visuals:
@@ -35,6 +38,19 @@
             1: { state: can-o1, shader: "unshaded" }
             2: { state: can-o2, shader: "unshaded" }
             3: { state: can-o3, shader: "unshaded" }
+        enum.PaperLabelVisuals.HasLabel:
+          enum.PaperLabelVisuals.Layer:
+            True: { visible: true }
+            False: { visible: false }
+        enum.StorageVisuals.Open:
+          enum.PaperLabelVisuals.Layer:
+            True: { visible: false }
+        enum.PaperLabelVisuals.LabelType:
+          enum.PaperLabelVisuals.Layer:
+            Paper: { state: paper }
+            Bounty: { state: bounty }
+            CaptainsPaper: { state: captains_paper }
+            Invoice: { state: invoice }
     - type: ActivatableUI
       key: enum.GasCanisterUiKey.Key
     - type: UIRequiresLock
@@ -89,6 +105,7 @@
     - type: ContainerContainer
       containers:
         tank_slot: !type:ContainerSlot {}
+        paper_label: !type:ContainerSlot
     - type: NodeContainer
       nodes:
         port:
@@ -107,6 +124,16 @@
             - GasTank
     - type: StaticPrice
       price: 200
+    - type: PaperLabel
+      labelSlot:
+        insertVerbText: comp-paper-label-insert
+        ejectVerbText: comp-paper-label-eject
+        whitelist:
+          components:
+          - Paper
+        blacklist:
+          tags:
+          - Book
     - type: AccessReader
       access: [["Atmospherics"], ["Engineering"], ["Research"]]
     - type: Lock
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/bounty.png b/Resources/Textures/Structures/Storage/canister.rsi/bounty.png
new file mode 100644
index 0000000000000000000000000000000000000000..19f08dd25c35ae37bd3e0a39bdd26e000eb261b1
GIT binary patch
literal 211
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}y`C<PArY;~
z2@<S}6GVEN0u8v_4tlWnOv%tYYx=+6cTe>v&qZfb7an2c0fL*JZW@19em*yG$^0aC
z10bmR^JntIkC)H$Y`U~Z<@M4o<||WLB|tcC-!HFCacW+=|9|{cKYY)b|Kv6QLXHog
xHyImv7#rN#^}7$G?Mpes%FaB9wQRBs40$JI{VQ&t+YfXYgQu&X%Q~loCIF6zR6zg$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/canister.rsi/captains_paper.png b/Resources/Textures/Structures/Storage/canister.rsi/captains_paper.png
new file mode 100644
index 0000000000000000000000000000000000000000..f080407b983bb027a7e8e9f12d1eeccfdd4afc39
GIT binary patch
literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6FglULn2z=
zUNYo5<RH@WFy1rMPhdmjiGy2&gR0qHH_Wx{41K4tVuBk-(yi@#SF&<nXLl^vmnWVk
z*~Tg;DEPD7*nh{WZRg9sm+t-j<L;SYhJ?Mh_RQfwYo}@dU5sHv#vFZhov5N~dl?)!
zR28T2^j8Df4X%rG`{SSA<$lsVXHmqZ((qsZ%xW92_^T^@Dt6o7E8lJ#eZL*(HU>{u
KKbLh*2~7Y2ZBvr~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/canister.rsi/invoice.png b/Resources/Textures/Structures/Storage/canister.rsi/invoice.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1da2f1ca02505f2fa20f7f99770c4a4629768cf
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6FprVLn2y}
z6C_v{Cy4Yk1sZU<9rR%DnUe8MZ{?qU-<oWH>x<7e1w3M41A^&iVnqJUdpX(j(s`Ga
z%o0Gbum0bW4^M81w!NQkKXJ|UM*;~zFd-l`9fW`Ucw~99N|Ub<C}|jTcl+#|zas4n
z>iY7{8`j7i?!Ij<dC#uSrJjAltQT$vH9#)7z{s#}jr<ljt3Cce$1!-i`njxgN@xNA
D*6LA`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/canister.rsi/meta.json b/Resources/Textures/Structures/Storage/canister.rsi/meta.json
index 95d67cc8ae..b3ed9a9889 100644
--- a/Resources/Textures/Structures/Storage/canister.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/canister.rsi/meta.json
@@ -1,122 +1,134 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Frezon canister modified from tgstation, the rest are taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8581a636acfc1517611a680b7711a74fc7ef335",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "black"
-    },
-    {
-      "name": "black-1"
-    },
-    {
-      "name": "blue"
-    },
-    {
-      "name": "blue-1"
-    },
-    {
-      "name": "can-connector"
-    },
-    {
-      "name": "locked"
-    },
-    {
-      "name": "unlocked"
-    },
-    {
-      "name": "can-o0",
-      "delays": [
-        [
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "can-o1"
-    },
-    {
-      "name": "can-o2"
-    },
-    {
-      "name": "can-o3"
-    },
-    {
-      "name": "can-oa1"
-    },
-    {
-      "name": "can-open"
-    },
-    {
-      "name": "grey"
-    },
-    {
-      "name": "grey-1"
-    },
-    {
-      "name": "orange"
-    },
-    {
-      "name": "orange-1"
-    },
-    {
-      "name": "red"
-    },
-    {
-      "name": "red-1"
-    },
-    {
-      "name": "redws"
-    },
-    {
-      "name": "redws-1"
-    },
-    {
-      "name": "yellow"
-    },
-    {
-      "name": "yellow-1"
-    },
-    {
-      "name": "green"
-    },
-    {
-      "name": "green-1"
-    },
-    {
-      "name": "greenys"
-    },
-    {
-      "name": "greenys-1"
-    },
-    {
-      "name": "darkblue"
-    },
-    {
-      "name": "darkblue-1"
-    },
-    {
-      "name": "frezon"
-    },
-    {
-      "name": "frezon-1"
-    },
-    {
-      "name": "water_vapor"
-    },
-    {
-      "name": "water_vapor-1"
-    },
-    {
-      "name": "scrubber-connector"
-    },
-    {
-      "name": "scrubber-open"
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Frezon canister modified from tgstation, the rest are taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8581a636acfc1517611a680b7711a74fc7ef335. Paper Sprites by Vermidia.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "black"
+        },
+        {
+            "name": "black-1"
+        },
+        {
+            "name": "blue"
+        },
+        {
+            "name": "blue-1"
+        },
+        {
+            "name": "can-connector"
+        },
+        {
+            "name": "locked"
+        },
+        {
+            "name": "unlocked"
+        },
+        {
+            "name": "can-o0",
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "can-o1"
+        },
+        {
+            "name": "can-o2"
+        },
+        {
+            "name": "can-o3"
+        },
+        {
+            "name": "can-oa1"
+        },
+        {
+            "name": "can-open"
+        },
+        {
+            "name": "grey"
+        },
+        {
+            "name": "grey-1"
+        },
+        {
+            "name": "orange"
+        },
+        {
+            "name": "orange-1"
+        },
+        {
+            "name": "red"
+        },
+        {
+            "name": "red-1"
+        },
+        {
+            "name": "redws"
+        },
+        {
+            "name": "redws-1"
+        },
+        {
+            "name": "yellow"
+        },
+        {
+            "name": "yellow-1"
+        },
+        {
+            "name": "green"
+        },
+        {
+            "name": "green-1"
+        },
+        {
+            "name": "greenys"
+        },
+        {
+            "name": "greenys-1"
+        },
+        {
+            "name": "darkblue"
+        },
+        {
+            "name": "darkblue-1"
+        },
+        {
+            "name": "frezon"
+        },
+        {
+            "name": "frezon-1"
+        },
+        {
+            "name": "water_vapor"
+        },
+        {
+            "name": "water_vapor-1"
+        },
+        {
+            "name": "scrubber-connector"
+        },
+        {
+            "name": "scrubber-open"
+        },
+        {
+            "name": "bounty"
+        },
+        {
+            "name": "captains_paper"
+        },
+        {
+            "name": "invoice"
+        },
+        {
+            "name": "paper"
+        }
+    ]
 }
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/paper.png b/Resources/Textures/Structures/Storage/canister.rsi/paper.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ddf4a3a62586aea33226879eb80f14c9fd5d3ee
GIT binary patch
literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}t)4E9ArY-_
zFBx(%8H%(#jNcfSKjGWlytl<oU)~iK_1sm<owfDs?uKhkt%eFspG!G?B-$D}Iy(OB
zKI~y}tfIbjeo)o#yO%u}8&2EU&s~4|(p39CF@}tHYi_$0zdy&P&ybKdLvnj9h<V}8
yNz3{<@^KGrd|L!GmIh@1t!upJudei|SgyBJ-v4&n);B;0F?hQAxvX<aXaWG9{!<qK

literal 0
HcmV?d00001

-- 
2.52.0