diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml index f0681fca59..5f6e62afe6 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml @@ -86,6 +86,8 @@ - id: CP14ClothingShirtYellowWizard - id: CP14FoodPotato - id: CP14Cloth10 + - id: CP14CrayonWhite + weight: 2 - !type:GroupSelector children: - id: CP14DyeYellow diff --git a/Resources/Prototypes/_CP14/Entities/Objects/crayons.yml b/Resources/Prototypes/_CP14/Entities/Objects/crayons.yml new file mode 100644 index 0000000000..b735308541 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/crayons.yml @@ -0,0 +1,212 @@ +- type: entity + abstract: true + parent: BaseItem + id: CP14Crayon + name: crayon + description: A colourful crayon. + categories: [ ForkFiltered ] + components: + - type: Sprite + sprite: _CP14/Objects/Specific/Thaumaturgy/crayon.rsi + layers: + - state: handle + - state: crayon + color: white + - type: Item + size: Tiny + - type: Tag + tags: + - Write + - Crayon + - type: UserInterface + interfaces: + enum.CrayonUiKey.Key: + type: CrayonBoundUserInterface + - type: Crayon + capacity: 15 + +- type: entity + parent: CP14Crayon + id: CP14CrayonWhite + name: white crayon + components: + - type: Sprite + layers: + - state: handle + - state: crayon + color: white + - type: Item + inhandVisuals: + left: + - state: handle-inhand-left + - state: crayon-inhand-left + color: white + right: + - state: handle-inhand-right + - state: crayon-inhand-right + color: white + - type: Crayon + color: white + +- type: entity + parent: CP14Crayon + id: CP14CrayonRainbow + name: magic rainbow crayon + components: + - type: Sprite + layers: + - state: handle + - state: crayon + color: white + - type: Item + inhandVisuals: + left: + - state: handle-inhand-left + - state: crayon-inhand-left + color: white + right: + - state: handle-inhand-right + - state: crayon-inhand-right + color: white + - type: Crayon + color: Red + selectableColor: true + capacity: 30 + +- type: entity + parent: CP14Crayon + id: CP14CrayonBlack + name: black crayon + components: + - type: Sprite + layers: + - state: handle + - state: crayon + color: black + - type: Item + inhandVisuals: + left: + - state: handle-inhand-left + - state: crayon-inhand-left + color: black + right: + - state: handle-inhand-right + - state: crayon-inhand-right + color: black + - type: Crayon + color: black + +- type: entity + parent: CP14Crayon + id: CP14CrayonRed + name: red crayon + components: + - type: Sprite + layers: + - state: handle + - state: crayon + color: red + - type: Item + inhandVisuals: + left: + - state: handle-inhand-left + - state: crayon-inhand-left + color: red + right: + - state: handle-inhand-right + - state: crayon-inhand-right + color: red + - type: Crayon + color: red + +- type: entity + parent: CP14Crayon + id: CP14CrayonYellow + name: yellow crayon + components: + - type: Sprite + layers: + - state: handle + - state: crayon + color: yellow + - type: Item + inhandVisuals: + left: + - state: handle-inhand-left + - state: crayon-inhand-left + color: yellow + right: + - state: handle-inhand-right + - state: crayon-inhand-right + color: yellow + - type: Crayon + color: yellow + +- type: entity + parent: CP14Crayon + id: CP14CrayonGreen + name: green crayon + components: + - type: Sprite + layers: + - state: handle + - state: crayon + color: green + - type: Item + inhandVisuals: + left: + - state: handle-inhand-left + - state: crayon-inhand-left + color: green + right: + - state: handle-inhand-right + - state: crayon-inhand-right + color: green + - type: Crayon + color: green + +- type: entity + parent: CP14Crayon + id: CP14CrayonBlue + name: blue crayon + components: + - type: Sprite + layers: + - state: handle + - state: crayon + color: blue + - type: Item + inhandVisuals: + left: + - state: handle-inhand-left + - state: crayon-inhand-left + color: blue + right: + - state: handle-inhand-right + - state: crayon-inhand-right + color: blue + - type: Crayon + color: lightblue + +- type: entity + parent: CP14Crayon + id: CP14CrayonPurple + name: purple crayon + components: + - type: Sprite + layers: + - state: handle + - state: crayon + color: purple + - type: Item + inhandVisuals: + left: + - state: handle-inhand-left + - state: crayon-inhand-left + color: purple + right: + - state: handle-inhand-right + - state: crayon-inhand-right + color: purple + - type: Crayon + color: purple diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml index 46f614a9d9..fb47e41f9b 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml @@ -307,3 +307,57 @@ entities: CP14DyeYellow: 1 result: CP14WallpaperYellow + +- type: CP14Recipe + id: CP14CrayonBlack + tag: CP14RecipeSewing + craftTime: 2 + entities: + CP14CrayonWhite: 1 + CP14DyeBlack: 1 + result: CP14CrayonBlack + +- type: CP14Recipe + id: CP14CrayonRed + tag: CP14RecipeSewing + craftTime: 2 + entities: + CP14CrayonWhite: 1 + CP14DyeRed: 1 + result: CP14CrayonRed + +- type: CP14Recipe + id: CP14CrayonYellow + tag: CP14RecipeSewing + craftTime: 2 + entities: + CP14CrayonWhite: 1 + CP14DyeYellow: 1 + result: CP14CrayonYellow + +- type: CP14Recipe + id: CP14CrayonGreen + tag: CP14RecipeSewing + craftTime: 2 + entities: + CP14CrayonWhite: 1 + CP14DyeGreen: 1 + result: CP14CrayonGreen + +- type: CP14Recipe + id: CP14CrayonBlue + tag: CP14RecipeSewing + craftTime: 2 + entities: + CP14CrayonWhite: 1 + CP14DyeBlue: 1 + result: CP14CrayonBlue + +- type: CP14Recipe + id: CP14CrayonPurple + tag: CP14RecipeSewing + craftTime: 2 + entities: + CP14CrayonWhite: 1 + CP14DyePurple: 1 + result: CP14CrayonPurple diff --git a/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/crayon-inhand-left.png b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/crayon-inhand-left.png new file mode 100644 index 0000000000..83136af6bc Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/crayon-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/crayon-inhand-right.png b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/crayon-inhand-right.png new file mode 100644 index 0000000000..2d6148e6b3 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/crayon-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/crayon.png b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/crayon.png new file mode 100644 index 0000000000..183996c89a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/crayon.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/handle-inhand-left.png b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/handle-inhand-left.png new file mode 100644 index 0000000000..d984eba536 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/handle-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/handle-inhand-right.png b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/handle-inhand-right.png new file mode 100644 index 0000000000..08e3b5cefe Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/handle-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/handle.png b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/handle.png new file mode 100644 index 0000000000..2f4f03ef0b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/handle.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/meta.json new file mode 100644 index 0000000000..7bf864f98d --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crayon.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by TheShuEd (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "handle" + }, + { + "name": "crayon" + }, + { + "name": "handle-inhand-left", + "directions": 4 + }, + { + "name": "handle-inhand-right", + "directions": 4 + }, + { + "name": "crayon-inhand-left", + "directions": 4 + }, + { + "name": "crayon-inhand-right", + "directions": 4 + } + ] +}