Crayon balance and reorganize (#3388)

* Organized and halved crayons write amount

* StackVisualizer for crayon box

* Mime's Crayon

* Gives crayons the write tag

* Applies reviews

* Fuck yo prefixes

* Update fun.yml

Resources/Maps/saltern.yml

@@ -37488,7 +37488,7 @@ entities:
     rot: 4.371139006309477E-08 rad
     type: Transform
 - uid: 4169
-  type: CrayonBoxFilled
+  type: CrayonBox
   components:
   - parent: 853
     pos: -19.173923,-9.122305

Resources/Prototypes/Catalog/Fills/Storage/Crates/fun.yml

@@ -62,7 +62,7 @@
   components:
   - type: StorageFill
     contents:
-      - name: CrayonBoxFilled
+      - name: CrayonBox
         amount: 1
       - name: CrayonWhite
         amount: 1

Resources/Prototypes/Entities/Objects/Fun/crayons.yml

@@ -0,0 +1,166 @@
+- type: Tag
+  id: Crayon
+
+- type: entity
+  parent: BaseItem
+  id: Crayon
+  name: crayon
+  abstract: true
+  description: "A colourful crayon. Looks tasty. Mmmm..."
+  components:
+  - type: Tag
+    tags:
+      - Write
+      - Crayon
+  - type: Item
+    size: 1
+  - type: UserInterface
+    interfaces:
+    - key: enum.CrayonUiKey.Key
+      type: CrayonBoundUserInterface
+
+- type: entity
+  parent: Crayon
+  id: CrayonWhite
+  name: white crayon
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/crayons.rsi
+    state: white
+  - type: Crayon
+    color: white
+    capacity: 5
+
+- type: entity
+  parent: Crayon
+  id: CrayonMime
+  name: mime crayon
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/crayons.rsi
+    state: mime
+  - type: Crayon
+    color: white
+    capacity: 5
+
+- type: entity
+  parent: Crayon
+  id: CrayonBlack
+  name: black crayon
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/crayons.rsi
+    state: black
+  - type: Crayon
+    color: black
+    capacity: 5
+
+- type: entity
+  parent: Crayon
+  id: CrayonRed
+  name: red crayon
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/crayons.rsi
+    state: red
+  - type: Crayon
+    color: red
+    capacity: 5
+
+- type: entity
+  parent: Crayon
+  id: CrayonOrange
+  name: orange crayon
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/crayons.rsi
+    state: orange
+  - type: Crayon
+    color: orange
+    capacity: 5
+
+- type: entity
+  parent: Crayon
+  id: CrayonYellow
+  name: yellow crayon
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/crayons.rsi
+    state: yellow
+  - type: Crayon
+    color: yellow
+    capacity: 5
+
+- type: entity
+  parent: Crayon
+  id: CrayonGreen
+  name: green crayon
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/crayons.rsi
+    state: green
+  - type: Crayon
+    color: green
+    capacity: 5
+
+- type: entity
+  parent: Crayon
+  id: CrayonBlue
+  name: blue crayon
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/crayons.rsi
+    state: blue
+  - type: Crayon
+    color: lightblue
+    capacity: 5
+
+- type: entity
+  parent: Crayon
+  id: CrayonPurple
+  name: purple crayon
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/crayons.rsi
+    state: purple
+  - type: Crayon
+    color: purple
+    capacity: 5
+
+- type: entity
+  id: CrayonBox
+  parent: BaseItem
+  name: crayon box
+  description: "It's a box of crayons."
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/crayons.rsi
+    netsync: false
+    state: box
+  - type: Storage
+    capacity: 7
+  - type: Item
+    size: 9999
+  - type: StorageCounter
+    countTag: Crayon
+  - type: StorageFill
+    contents:
+      - name: CrayonRed
+      - name: CrayonOrange
+      - name: CrayonYellow
+      - name: CrayonGreen
+      - name: CrayonBlue
+      - name: CrayonPurple
+      - name: CrayonBlack
+  - type: Appearance
+    visuals:
+      - type: StackVisualizer
+        composite: true
+        stackLayers:
+          - red_box
+          - orange_box
+          - yellow_box
+          - green_box
+          - blue_box
+          - purple_box
+          - black_box

Resources/Prototypes/Entities/Objects/Misc/crayons.yml

@@ -1,112 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: Crayon
-  name: crayon
-  abstract: true
-  description: "A colourful crayon. Looks tasty. Mmmm..."
-  components:
-  - type: UserInterface
-    interfaces:
-    - key: enum.CrayonUiKey.Key
-      type: CrayonBoundUserInterface
-
-- type: entity
-  parent: Crayon
-  id: CrayonWhite
-  suffix: White
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/crayons.rsi
-    state: crayonwhite
-  - type: Crayon
-    color: white
-    capacity: 30
-
-- type: entity
-  parent: Crayon
-  id: CrayonRed
-  suffix: Red
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/crayons.rsi
-    state: crayonred
-  - type: Crayon
-    color: red
-    capacity: 30
-
-- type: entity
-  parent: Crayon
-  id: CrayonGreen
-  suffix: Green
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/crayons.rsi
-    state: crayongreen
-  - type: Crayon
-    color: green
-    capacity: 30
-
-- type: entity
-  parent: Crayon
-  id: CrayonPurple
-  suffix: Purple
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/crayons.rsi
-    state: crayonpurple
-  - type: Crayon
-    color: purple
-    capacity: 30
-
-- type: entity
-  parent: Crayon
-  id: CrayonOrange
-  suffix: Orange
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/crayons.rsi
-    state: crayonorange
-  - type: Crayon
-    color: orange
-    capacity: 30
-
-- type: entity
-  parent: Crayon
-  id: CrayonYellow
-  suffix: Yellow
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/crayons.rsi
-    state: crayonyellow
-  - type: Crayon
-    color: yellow
-    capacity: 30
-
-- type: entity
-  id: CrayonBox
-  parent: BaseItem
-  name: crayon box
-  description: "It's a box of crayons."
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/crayons.rsi
-    state: crayonbox
-  - type: Storage
-    capacity: 30
-  - type: Item
-    size: 9999
-
-- type: entity
-  id: CrayonBoxFilled
-  name: crayon box
-  parent: CrayonBox
-  suffix: Filled
-  components:
-  - type: StorageFill
-    contents:
-      - name: CrayonGreen
-      - name: CrayonOrange
-      - name: CrayonPurple
-      - name: CrayonRed
-      - name: CrayonWhite
-      - name: CrayonYellow

Resources/Prototypes/Roles/Jobs/Civilian/mime.yml

@@ -19,7 +19,7 @@
     belt: ClothingBeltSuspenders
     gloves: ClothingHandsGlovesLatex
     shoes: ClothingShoesColorWhite
-    pocket1: Pen
+    pocket1: CrayonMime
     pocket2: Paper
     mask: ClothingMaskMime
     idcard: MimePDA

Resources/Textures/Objects/Fun/crayons.rsi/meta.json

@@ -0,0 +1,65 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+        "name": "black"
+    },
+    {
+        "name": "blue"
+    },
+    {
+        "name": "box"
+    },
+    {
+        "name": "green"
+    },
+    {
+        "name": "mime"
+    },
+    {
+        "name": "orange"
+    },
+    {
+        "name": "purple"
+    },
+    {
+        "name": "rainbow"
+    },
+    {
+        "name": "red"
+    },
+    {
+        "name": "white"
+    },
+    {
+        "name": "yellow"
+    },
+    {
+        "name": "green_box"
+    },
+    {
+        "name": "orange_box"
+    },
+    {
+        "name": "purple_box"
+    },
+    {
+        "name": "red_box"
+    },
+    {
+        "name": "yellow_box"
+    },
+    {
+        "name": "black_box"
+    },
+    {
+        "name": "blue_box"
+    }
+  ]
+}

Resources/Textures/Objects/Fun/spraycans.rsi/meta.json

@@ -0,0 +1,62 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+        "name": "death"
+    },
+    {
+        "name": "death2"
+    },
+    {
+        "name": "death2_cap"
+    },
+    {
+        "name": "death_cap"
+    },
+    {
+        "name": "green"
+    },
+    {
+        "name": "mime"
+    },
+    {
+        "name": "mime2"
+    },
+    {
+        "name": "mime2_cap"
+    },
+    {
+        "name": "mime_cap"
+    },
+    {
+        "name": "rainbow"
+    },
+    {
+        "name": "rainbow2"
+    },
+    {
+        "name": "rainbow2_cap"
+    },
+    {
+        "name": "rainbow_cap"
+    },
+    {
+        "name": "spray"
+    },
+    {
+        "name": "spray_cap"
+    },
+    {
+        "name": "spray_cap_colors"
+    },
+    {
+        "name": "spray_colors"
+    }
+  ]
+}

Resources/Textures/Objects/Misc/crayons.rsi/meta.json

@@ -1,161 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "black",
-
-        },
-        {
-            "name": "blue",
-
-        },
-        {
-            "name": "clowncan",
-
-        },
-        {
-            "name": "clowncan2",
-
-        },
-        {
-            "name": "clowncan2_cap",
-
-        },
-        {
-            "name": "clowncan_cap",
-
-        },
-        {
-            "name": "crayonblack",
-
-        },
-        {
-            "name": "crayonblue",
-
-        },
-        {
-            "name": "crayonbox",
-
-        },
-        {
-            "name": "crayongreen",
-
-        },
-        {
-            "name": "crayonmime",
-
-        },
-        {
-            "name": "crayonorange",
-
-        },
-        {
-            "name": "crayonpurple",
-
-        },
-        {
-            "name": "crayonrainbow",
-
-        },
-        {
-            "name": "crayonred",
-
-        },
-        {
-            "name": "crayonwhite",
-
-        },
-        {
-            "name": "crayonyellow",
-
-        },
-        {
-            "name": "deathcan",
-
-        },
-        {
-            "name": "deathcan2",
-
-        },
-        {
-            "name": "deathcan2_cap",
-
-        },
-        {
-            "name": "deathcan_cap",
-
-        },
-        {
-            "name": "green",
-
-        },
-        {
-            "name": "mimecan",
-
-        },
-        {
-            "name": "mimecan2",
-
-        },
-        {
-            "name": "mimecan2_cap",
-
-        },
-        {
-            "name": "mimecan_cap",
-
-        },
-        {
-            "name": "orange",
-
-        },
-        {
-            "name": "purple",
-
-        },
-        {
-            "name": "rainbowcan",
-
-        },
-        {
-            "name": "rainbowcan2",
-
-        },
-        {
-            "name": "rainbowcan2_cap",
-
-        },
-        {
-            "name": "rainbowcan_cap",
-
-        },
-        {
-            "name": "red",
-
-        },
-        {
-            "name": "spraycan",
-
-        },
-        {
-            "name": "spraycan_cap",
-
-        },
-        {
-            "name": "spraycan_cap_colors",
-
-        },
-        {
-            "name": "spraycan_colors",
-
-        },
-        {
-            "name": "yellow",
-
-        }
-    ]
-}