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
This commit is contained in:
Swept
2021-02-28 00:59:20 +00:00
committed by GitHub
parent 986b481e9a
commit a9a96f2edc
46 changed files with 296 additions and 276 deletions

View File

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

View File

@@ -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

View File

@@ -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

View File

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