Add paper labels to gas canisters (#41737)

* paper? on canisters? are you KIDDING

* woops forgot something

* I think this'll fix the errors?

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index b37d3d4c4dc06eb2b462808b197b4926e6f0dba0..3bacc4442b0d329331c88f9f753454ed1d90eb39 100644 (file)
--- 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 (file)
index 0000000..19f08dd
Binary files /dev/null and b/Resources/Textures/Structures/Storage/canister.rsi/bounty.png differ

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 (file)
index 0000000..f080407
Binary files /dev/null and b/Resources/Textures/Structures/Storage/canister.rsi/captains_paper.png differ

diff --git a/Resources/Textures/Structures/Storage/canister.rsi/invoice.png b/Resources/Textures/Structures/Storage/canister.rsi/invoice.png
new file mode 100644 (file)
index 0000000..c1da2f1
Binary files /dev/null and b/Resources/Textures/Structures/Storage/canister.rsi/invoice.png differ

diff --git a/Resources/Textures/Structures/Storage/canister.rsi/meta.json b/Resources/Textures/Structures/Storage/canister.rsi/meta.json
index 95d67cc8ae18e3c52f59da74c07f78d2feeb52ad..b3ed9a988952b58b74451a7f67d92821e2944527 100644 (file)
--- 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 (file)
index 0000000..7ddf4a3
Binary files /dev/null and b/Resources/Textures/Structures/Storage/canister.rsi/paper.png differ