From: SpaceRox1244 <138547931+SpaceRox1244@users.noreply.github.com>
Date: Sun, 17 Nov 2024 03:27:29 +0000 (-0500)
Subject: Adds paper label visuals to closets and lockers (#33318)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=d9c677e91b8796aaa0a63aae6a84c309ed811338;p=space-station-14.git

Adds paper label visuals to closets and lockers (#33318)

* Modifies label sprites and adds label visuals to closets

* Removes redundant GenericVisualizer component
---

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
index 7d7bc94bb3..8e2d1a6e54 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
@@ -20,6 +20,11 @@
     - state: welded
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
+    - state: paper
+      visible: false
+      sprite: Structures/Storage/closet_labels.rsi
+      offset: "-0.065,0"
+      map: ["enum.PaperLabelVisuals.Layer"]
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index 9351a0d540..2568c45a6a 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -19,6 +19,10 @@
     - state: welded
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
+    - state: paper
+      visible: false
+      sprite: Structures/Storage/closet_labels.rsi
+      map: ["enum.PaperLabelVisuals.Layer"]
   - type: MovedByPressure
   - type: PaperLabel
     labelSlot:
@@ -86,6 +90,21 @@
           SheetSteel1:
             min: 1
             max: 1
+  - type: GenericVisualizer
+    visuals:
+      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: Appearance
   - type: EntityStorageVisuals
     stateBaseClosed: generic
diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png
index 52e515e39b..1258071a1a 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png
index 961991bf34..9a2c339936 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png
index 3e00e7d806..30649e06ee 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json
index c180604984..8ff0cc7179 100644
--- a/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprites by Vermidia.",
+  "copyright": "Sprites by Vermidia and modified by SpaceRox1244.",
   "size": {
     "x": 32,
     "y": 32
@@ -20,4 +20,4 @@
       "name": "invoice"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png
index 8daf777083..bd6c7138f6 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png differ
diff --git a/Resources/Textures/Structures/Storage/closet_labels.rsi/bounty.png b/Resources/Textures/Structures/Storage/closet_labels.rsi/bounty.png
new file mode 100644
index 0000000000..8146de6c6e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet_labels.rsi/bounty.png differ
diff --git a/Resources/Textures/Structures/Storage/closet_labels.rsi/captains_paper.png b/Resources/Textures/Structures/Storage/closet_labels.rsi/captains_paper.png
new file mode 100644
index 0000000000..d6c3de92fd
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet_labels.rsi/captains_paper.png differ
diff --git a/Resources/Textures/Structures/Storage/closet_labels.rsi/invoice.png b/Resources/Textures/Structures/Storage/closet_labels.rsi/invoice.png
new file mode 100644
index 0000000000..7f1a3795b8
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet_labels.rsi/invoice.png differ
diff --git a/Resources/Textures/Structures/Storage/closet_labels.rsi/meta.json b/Resources/Textures/Structures/Storage/closet_labels.rsi/meta.json
new file mode 100644
index 0000000000..3e64ac931c
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/closet_labels.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by Vermidia and modified by SpaceRox1244.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "paper"
+        },
+        {
+            "name": "bounty"
+        },
+        {
+            "name": "captains_paper"
+        },
+        {
+            "name": "invoice"
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Storage/closet_labels.rsi/paper.png b/Resources/Textures/Structures/Storage/closet_labels.rsi/paper.png
new file mode 100644
index 0000000000..83b15b95a2
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet_labels.rsi/paper.png differ