diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 3e12e20cf2..35785b2484 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -183,6 +183,7 @@ - id: PlushieCarp - id: PlushieNuke - id: PlushieLizard + - id: PlushieSharkBlue - type: entity parent: ClothingBackpackDuffelSyndicateBundle diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 58303a2822..2d7b6ff33d 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -26,6 +26,8 @@ amount: 1 - id: PlushieRatvar amount: 1 + - id: PlushieSharkBlue + amount: 1 - type: entity id: CrateFunInstruments diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 6a6c48f89c..6d3fd7468b 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -192,6 +192,8 @@ - id: ClothingShoesBootsJack - id: CigarGoldCase prob: 0.50 + - id: PlushieSharkPink + prob: 0.1 - id: DoorRemoteSecurity - id: ClothingUniformJumpskirtHosFormal - id: ClothingUniformJumpsuitHosFormal diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index 2ae01709fa..61629a0513 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -24,6 +24,9 @@ - PlushieSpaceLizard - PlushieRouny - PlushieLamp + - PlushieSharkBlue + - PlushieSharkPink + - PlushieSharkGrey - ToyAmongPequeno - ToyMouse chance: 0.5 diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 65d0ae983e..9c0b78a55b 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -129,6 +129,42 @@ soundHit: path: /Audio/Items/Toys/muffled_weh.ogg +- type: entity + parent: BasePlushie + id: PlushieSharkBlue + name: blue shark soft toy + description: Big and safe to have by your side if you want to discover the world below the surface of the ocean. + components: + - type: Sprite + sprite: Objects/Fun/sharkplush.rsi + state: blue + - type: Item + heldPrefix: blue + +- type: entity + parent: PlushieSharkBlue + id: PlushieSharkPink + name: pink shark soft toy + description: Hehe shonk :) + components: + - type: Sprite + sprite: Objects/Fun/sharkplush.rsi + state: pink + - type: Item + heldPrefix: pink + +- type: entity + parent: PlushieSharkBlue + id: PlushieSharkGrey + name: grey shark soft toy + description: A quiet, reserved kind of shonk. Loves to ride the grey tide. + components: + - type: Sprite + sprite: Objects/Fun/sharkplush.rsi + state: grey + - type: Item + heldPrefix: grey + - type: entity parent: BasePlushie id: PlushieRatvar diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-left.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-left.png new file mode 100644 index 0000000000..d3171963d5 Binary files /dev/null and b/Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-right.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-right.png new file mode 100644 index 0000000000..96c6b4d173 Binary files /dev/null and b/Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/blue.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/blue.png new file mode 100644 index 0000000000..05b87738f0 Binary files /dev/null and b/Resources/Textures/Objects/Fun/sharkplush.rsi/blue.png differ diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-left.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-left.png new file mode 100644 index 0000000000..560eaff496 Binary files /dev/null and b/Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-right.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-right.png new file mode 100644 index 0000000000..a41be1d569 Binary files /dev/null and b/Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/grey.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/grey.png new file mode 100644 index 0000000000..1f733e66a4 Binary files /dev/null and b/Resources/Textures/Objects/Fun/sharkplush.rsi/grey.png differ diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json b/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json new file mode 100644 index 0000000000..a19aa0e583 --- /dev/null +++ b/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited for SS14 by GitHub user Willhelm53", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "blue" + }, + { + "name": "blue-inhand-left", + "directions": 4 + }, + { + "name": "blue-inhand-right", + "directions": 4 + }, + { + "name": "pink" + }, + { + "name": "pink-inhand-left", + "directions": 4 + }, + { + "name": "pink-inhand-right", + "directions": 4 + }, + { + "name": "grey" + }, + { + "name": "grey-inhand-left", + "directions": 4 + }, + { + "name": "grey-inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-left.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-left.png new file mode 100644 index 0000000000..0ab0549a15 Binary files /dev/null and b/Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-right.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-right.png new file mode 100644 index 0000000000..c5b64bfe74 Binary files /dev/null and b/Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/pink.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/pink.png new file mode 100644 index 0000000000..71bff9d6f2 Binary files /dev/null and b/Resources/Textures/Objects/Fun/sharkplush.rsi/pink.png differ