diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml index 20392fdd31..6507da9848 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml @@ -9,8 +9,6 @@ tags: - Write - Crayon - - type: Item - size: 1 - type: UserInterface interfaces: - key: enum.CrayonUiKey.Key @@ -26,6 +24,10 @@ - type: Sprite sprite: Objects/Fun/crayons.rsi state: white + - type: Item + sprite: Objects/Fun/crayons.rsi + size: 1 + HeldPrefix: white - type: Crayon color: white capacity: 5 @@ -41,6 +43,10 @@ - type: Sprite sprite: Objects/Fun/crayons.rsi state: mime + - type: Item + sprite: Objects/Fun/crayons.rsi + size: 1 + HeldPrefix: mime - type: Crayon color: white capacity: 5 @@ -56,6 +62,10 @@ - type: Sprite sprite: Objects/Fun/crayons.rsi state: black + - type: Item + sprite: Objects/Fun/crayons.rsi + size: 1 + HeldPrefix: black - type: Crayon color: black capacity: 5 @@ -71,6 +81,10 @@ - type: Sprite sprite: Objects/Fun/crayons.rsi state: red + - type: Item + sprite: Objects/Fun/crayons.rsi + size: 1 + HeldPrefix: red - type: Crayon color: red capacity: 5 @@ -86,6 +100,10 @@ - type: Sprite sprite: Objects/Fun/crayons.rsi state: orange + - type: Item + sprite: Objects/Fun/crayons.rsi + size: 1 + HeldPrefix: orange - type: Crayon color: orange capacity: 5 @@ -101,6 +119,10 @@ - type: Sprite sprite: Objects/Fun/crayons.rsi state: yellow + - type: Item + sprite: Objects/Fun/crayons.rsi + size: 1 + HeldPrefix: yellow - type: Crayon color: yellow capacity: 5 @@ -116,6 +138,10 @@ - type: Sprite sprite: Objects/Fun/crayons.rsi state: green + - type: Item + sprite: Objects/Fun/crayons.rsi + size: 1 + HeldPrefix: green - type: Crayon color: green capacity: 5 @@ -131,6 +157,10 @@ - type: Sprite sprite: Objects/Fun/crayons.rsi state: blue + - type: Item + sprite: Objects/Fun/crayons.rsi + size: 1 + HeldPrefix: blue - type: Crayon color: lightblue capacity: 5 @@ -146,6 +176,10 @@ - type: Sprite sprite: Objects/Fun/crayons.rsi state: purple + - type: Item + sprite: Objects/Fun/crayons.rsi + size: 1 + HeldPrefix: purple - type: Crayon color: purple capacity: 5 @@ -166,7 +200,9 @@ - type: Storage capacity: 7 - type: Item + sprite: Objects/Fun/crayons.rsi size: 9999 + HeldPrefix: box - type: StorageCounter countTag: Crayon - type: StorageFill diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/black-inhand-left.png b/Resources/Textures/Objects/Fun/crayons.rsi/black-inhand-left.png new file mode 100644 index 0000000000..ed9d3a1b45 Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/black-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/black-inhand-right.png b/Resources/Textures/Objects/Fun/crayons.rsi/black-inhand-right.png new file mode 100644 index 0000000000..f02a5e23c7 Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/black-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/blue-inhand-left.png b/Resources/Textures/Objects/Fun/crayons.rsi/blue-inhand-left.png new file mode 100644 index 0000000000..edc0737bb6 Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/blue-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/blue-inhand-right.png b/Resources/Textures/Objects/Fun/crayons.rsi/blue-inhand-right.png new file mode 100644 index 0000000000..ec14d8a5fe Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/blue-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/box-inhand-left.png b/Resources/Textures/Objects/Fun/crayons.rsi/box-inhand-left.png new file mode 100644 index 0000000000..fca1767c54 Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/box-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/box-inhand-right.png b/Resources/Textures/Objects/Fun/crayons.rsi/box-inhand-right.png new file mode 100644 index 0000000000..fb4c3fd29f Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/box-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/green-inhand-left.png b/Resources/Textures/Objects/Fun/crayons.rsi/green-inhand-left.png new file mode 100644 index 0000000000..8d5c41bf65 Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/green-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/green-inhand-right.png b/Resources/Textures/Objects/Fun/crayons.rsi/green-inhand-right.png new file mode 100644 index 0000000000..584ca4312c Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/green-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/meta.json b/Resources/Textures/Objects/Fun/crayons.rsi/meta.json index 464c1ef137..40b21c290b 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 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", "size": { "x": 32, "y": 32 @@ -10,36 +10,124 @@ { "name": "black" }, + { + "name": "black-inhand-left", + "directions": 4 + }, + { + "name": "black-inhand-right", + "directions": 4 + }, { "name": "blue" }, + { + "name": "blue-inhand-left", + "directions": 4 + }, + { + "name": "blue-inhand-right", + "directions": 4 + }, { "name": "box" }, + { + "name": "box-inhand-left", + "directions": 4 + }, + { + "name": "box-inhand-right", + "directions": 4 + }, { "name": "green" }, + { + "name": "green-inhand-left", + "directions": 4 + }, + { + "name": "green-inhand-right", + "directions": 4 + }, { "name": "mime" }, + { + "name": "mime-inhand-left", + "directions": 4 + }, + { + "name": "mime-inhand-right", + "directions": 4 + }, { "name": "orange" }, + { + "name": "orange-inhand-left", + "directions": 4 + }, + { + "name": "orange-inhand-right", + "directions": 4 + }, { "name": "purple" }, + { + "name": "purple-inhand-left", + "directions": 4 + }, + { + "name": "purple-inhand-right", + "directions": 4 + }, { "name": "rainbow" }, + { + "name": "rainbow-inhand-left", + "directions": 4 + }, + { + "name": "rainbow-inhand-right", + "directions": 4 + }, { "name": "red" }, + { + "name": "red-inhand-left", + "directions": 4 + }, + { + "name": "red-inhand-right", + "directions": 4 + }, { "name": "white" }, + { + "name": "white-inhand-left", + "directions": 4 + }, + { + "name": "white-inhand-right", + "directions": 4 + }, { "name": "yellow" }, + { + "name": "yellow-inhand-left", + "directions": 4 + }, + { + "name": "yellow-inhand-right", + "directions": 4 + }, { "name": "green_box" }, diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/mime-inhand-left.png b/Resources/Textures/Objects/Fun/crayons.rsi/mime-inhand-left.png new file mode 100644 index 0000000000..4e2ffb62ba Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/mime-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/mime-inhand-right.png b/Resources/Textures/Objects/Fun/crayons.rsi/mime-inhand-right.png new file mode 100644 index 0000000000..10fcb4e744 Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/mime-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/orange-inhand-left.png b/Resources/Textures/Objects/Fun/crayons.rsi/orange-inhand-left.png new file mode 100644 index 0000000000..46dda3dab1 Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/orange-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/orange-inhand-right.png b/Resources/Textures/Objects/Fun/crayons.rsi/orange-inhand-right.png new file mode 100644 index 0000000000..4294929c13 Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/orange-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/purple-inhand-left.png b/Resources/Textures/Objects/Fun/crayons.rsi/purple-inhand-left.png new file mode 100644 index 0000000000..fca73bed83 Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/purple-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/purple-inhand-right.png b/Resources/Textures/Objects/Fun/crayons.rsi/purple-inhand-right.png new file mode 100644 index 0000000000..889588c4e1 Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/purple-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/rainbow-inhand-left.png b/Resources/Textures/Objects/Fun/crayons.rsi/rainbow-inhand-left.png new file mode 100644 index 0000000000..4f191c87d4 Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/rainbow-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/rainbow-inhand-right.png b/Resources/Textures/Objects/Fun/crayons.rsi/rainbow-inhand-right.png new file mode 100644 index 0000000000..7eb1adee35 Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/rainbow-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/red-inhand-left.png b/Resources/Textures/Objects/Fun/crayons.rsi/red-inhand-left.png new file mode 100644 index 0000000000..30af494e41 Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/red-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/red-inhand-right.png b/Resources/Textures/Objects/Fun/crayons.rsi/red-inhand-right.png new file mode 100644 index 0000000000..14d62ef906 Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/red-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/white-inhand-left.png b/Resources/Textures/Objects/Fun/crayons.rsi/white-inhand-left.png new file mode 100644 index 0000000000..9297ff09ab Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/white-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/white-inhand-right.png b/Resources/Textures/Objects/Fun/crayons.rsi/white-inhand-right.png new file mode 100644 index 0000000000..c2b98d4d7f Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/white-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/yellow-inhand-left.png b/Resources/Textures/Objects/Fun/crayons.rsi/yellow-inhand-left.png new file mode 100644 index 0000000000..0777c0d76a Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/yellow-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/yellow-inhand-right.png b/Resources/Textures/Objects/Fun/crayons.rsi/yellow-inhand-right.png new file mode 100644 index 0000000000..d09ecba0e3 Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/yellow-inhand-right.png differ