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 e693f9b7c4d581cc820a51d018d5b3479d2cf2dd..cb755b161a61dc5d8442d7aff3b0f66191b193d0 100644 (file)
--- 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 aa9cc97a01768cf33820814b7e12349fb98b4d79..c4b4d9cfdc412ff8ab1bba491f3b8e02ad7821fa 100644 (file)
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 2e974939cf72a3cba92da5cff65eb2ccac5dd2e6..519accac21b9555da650e9ff8109caf33d944c3b 100644 (file)
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 ec61836917e8e5dc668542d5edab3edca14545cb..3cf8156030367aaa02fb85a179f68a6bbe2cbcc2 100644 (file)
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 e6165cfa8c7b72be1381a09699948e26e738b455..8b5818a09f0e26cb04a651352051321941b897c2 100644 (file)
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 40b21c290b9128d06c21fb9debef6c6f3714de01..fd4cad8ac25f3f46a63526a7838dccb9e46de297 100644 (file)
--- 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 cb354ae53836f84abe839ce2df8a6327eabb916e..dbc57e084e9cafdb8450744355ef8771af2fb425 100644 (file)
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 73c8fdfb430a02c5386796e25583d74ffa315e5c..8ac7a876daffeb53b23b21660bf8403c4c3e202d 100644 (file)
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 1b47d24e0a90c7baab00d73956e544f03edb15ec..465a5a9238758aa663b63fec529c19c1a0efcb2c 100644 (file)
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 (file)
index 0000000..69e1795
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 284db7c39bdbf06a26bd40ae80d56167a7cfdf3e..e08b32533344d6e048aa16aa8231d6a4310e1abc 100644 (file)
Binary files a/Resources/Textures/Objects/Fun/crayons.rsi/yellow_box.png and b/Resources/Textures/Objects/Fun/crayons.rsi/yellow_box.png differ