From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Sat, 16 Dec 2023 03:20:39 +0000 (+1100)
Subject: Crayon boxes get white crayons (#22553)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=57c6e503d1fb571db0f79c7e9c65edd1acdd7153;p=space-station-14.git

Crayon boxes get white crayons (#22553)
---

diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
index e693f9b7c4..cb755b161a 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -236,7 +236,7 @@
     state: box
   - type: Storage
     grid:
-    - 0,0,6,0
+    - 0,0,7,0
     maxItemSize: Tiny
   - type: Item
     sprite: Objects/Fun/crayons.rsi
@@ -251,6 +251,7 @@
     - id: CrayonBlue
     - id: CrayonPurple
     - id: CrayonBlack
+    - id: CrayonWhite
   - type: ItemMapper
     mapLayers:
       black_box:
@@ -281,4 +282,8 @@
         whitelist:
           tags:
           - CrayonYellow
+      white_box:
+        whitelist:
+          tags:
+          - CrayonWhite
   - type: Appearance
diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/black_box.png b/Resources/Textures/Objects/Fun/crayons.rsi/black_box.png
index aa9cc97a01..c4b4d9cfdc 100644
Binary files a/Resources/Textures/Objects/Fun/crayons.rsi/black_box.png and b/Resources/Textures/Objects/Fun/crayons.rsi/black_box.png differ
diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/blue_box.png b/Resources/Textures/Objects/Fun/crayons.rsi/blue_box.png
index 2e974939cf..519accac21 100644
Binary files a/Resources/Textures/Objects/Fun/crayons.rsi/blue_box.png and b/Resources/Textures/Objects/Fun/crayons.rsi/blue_box.png differ
diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/box.png b/Resources/Textures/Objects/Fun/crayons.rsi/box.png
index ec61836917..3cf8156030 100644
Binary files a/Resources/Textures/Objects/Fun/crayons.rsi/box.png and b/Resources/Textures/Objects/Fun/crayons.rsi/box.png differ
diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/green_box.png b/Resources/Textures/Objects/Fun/crayons.rsi/green_box.png
index e6165cfa8c..8b5818a09f 100644
Binary files a/Resources/Textures/Objects/Fun/crayons.rsi/green_box.png and b/Resources/Textures/Objects/Fun/crayons.rsi/green_box.png differ
diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/meta.json b/Resources/Textures/Objects/Fun/crayons.rsi/meta.json
index 40b21c290b..fd4cad8ac2 100644
--- a/Resources/Textures/Objects/Fun/crayons.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/crayons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
+  "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, tweaked by Ubaser",
   "size": {
     "x": 32,
     "y": 32
@@ -148,6 +148,9 @@
     },
     {
       "name": "blue_box"
+    },
+    {
+      "name": "white_box"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/orange_box.png b/Resources/Textures/Objects/Fun/crayons.rsi/orange_box.png
index cb354ae538..dbc57e084e 100644
Binary files a/Resources/Textures/Objects/Fun/crayons.rsi/orange_box.png and b/Resources/Textures/Objects/Fun/crayons.rsi/orange_box.png differ
diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/purple_box.png b/Resources/Textures/Objects/Fun/crayons.rsi/purple_box.png
index 73c8fdfb43..8ac7a876da 100644
Binary files a/Resources/Textures/Objects/Fun/crayons.rsi/purple_box.png and b/Resources/Textures/Objects/Fun/crayons.rsi/purple_box.png differ
diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/red_box.png b/Resources/Textures/Objects/Fun/crayons.rsi/red_box.png
index 1b47d24e0a..465a5a9238 100644
Binary files a/Resources/Textures/Objects/Fun/crayons.rsi/red_box.png and b/Resources/Textures/Objects/Fun/crayons.rsi/red_box.png differ
diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/white_box.png b/Resources/Textures/Objects/Fun/crayons.rsi/white_box.png
new file mode 100644
index 0000000000..69e1795b69
Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/white_box.png differ
diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/yellow_box.png b/Resources/Textures/Objects/Fun/crayons.rsi/yellow_box.png
index 284db7c39b..e08b325333 100644
Binary files a/Resources/Textures/Objects/Fun/crayons.rsi/yellow_box.png and b/Resources/Textures/Objects/Fun/crayons.rsi/yellow_box.png differ