From a6be9e75dc1f038a856e8ef79180ff41b6d74fc1 Mon Sep 17 00:00:00 2001 From: Willhelm53 <97707302+Willhelm53@users.noreply.github.com> Date: Sat, 22 Oct 2022 16:58:18 -0500 Subject: [PATCH] Blue Shark Soft Toy! (#12047) --- .../Catalog/Fills/Backpacks/duffelbag.yml | 1 + .../Prototypes/Catalog/Fills/Crates/fun.yml | 2 + .../Catalog/Fills/Lockers/heads.yml | 2 + .../Entities/Markers/Spawners/Random/toy.yml | 3 ++ .../Prototypes/Entities/Objects/Fun/toys.yml | 36 ++++++++++++++ .../Fun/sharkplush.rsi/blue-inhand-left.png | Bin 0 -> 818 bytes .../Fun/sharkplush.rsi/blue-inhand-right.png | Bin 0 -> 825 bytes .../Objects/Fun/sharkplush.rsi/blue.png | Bin 0 -> 377 bytes .../Fun/sharkplush.rsi/grey-inhand-left.png | Bin 0 -> 791 bytes .../Fun/sharkplush.rsi/grey-inhand-right.png | Bin 0 -> 792 bytes .../Objects/Fun/sharkplush.rsi/grey.png | Bin 0 -> 360 bytes .../Objects/Fun/sharkplush.rsi/meta.json | 44 ++++++++++++++++++ .../Fun/sharkplush.rsi/pink-inhand-left.png | Bin 0 -> 805 bytes .../Fun/sharkplush.rsi/pink-inhand-right.png | Bin 0 -> 808 bytes .../Objects/Fun/sharkplush.rsi/pink.png | Bin 0 -> 353 bytes 15 files changed, 88 insertions(+) create mode 100644 Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-left.png create mode 100644 Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-right.png create mode 100644 Resources/Textures/Objects/Fun/sharkplush.rsi/blue.png create mode 100644 Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-left.png create mode 100644 Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-right.png create mode 100644 Resources/Textures/Objects/Fun/sharkplush.rsi/grey.png create mode 100644 Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json create mode 100644 Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-left.png create mode 100644 Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-right.png create mode 100644 Resources/Textures/Objects/Fun/sharkplush.rsi/pink.png 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 0000000000000000000000000000000000000000..d3171963d5961a67f336c3c169b079fad3cadaaa GIT binary patch literal 818 zcmV-21I_%2P){M0_1Q*$_qeO4$_$IZs@X0Tb||})VIK{ z#q*s*aFsWJkNaCZpy0i@*&4enp6l_-NhjNQ@Kx*UU@>r%e98o2?}s4X^ldhQ;md<| zP7S5{Da#T@07g#Ixj{k*bWJd%d=6VD09)IxDD;!pVk8GN&p~oB>)h)5&(!?2>?W{1OOse0sxUK>svK9q%ihu zpViz$68#6d*C{|j=;{R~ssZ$I7xqpZ1e zg>Fh9o1wcsx@^f9G4_lP;B|I=>G} z7h|T&YwjF<=K57hf$$~@tQuos6;)T5hr?zJ8!JqLXZ9N(Wof<5UmWXv5t0V5609m( zO8Tmf5$Y8v$K#E{Ctjo7;e5VcTWl>wC~bNjUp2PCLe_7Bx*I41Mu}i#@Z4?#fv;I# zOZzGyF4g2q$gGRCt{2nz2qJF%X6a$sI}>Bwhw;5dA#{r$eGaP_S2AbWJ4C zQS%xI`n(JhO(JU8S!JThWX5Z6d}J5sB6@ZK)eOmhJ^qp4sO@IAR_-ZIvIiqx)U#tE9fEG3c zKqF6+D;WLzV-9LWss9#>1)KqVc^X*H!|NEd7PyrLPTsV(jH=4^V%gWnUj_}!Pc;S3 zuKz-_3OoWdvtQrWCGS$91te4U_~(t+#+m>;zs3&}n9t{C4voj-)yv1OW?y?QPK zPzp$+6lAOuyTtPO+x-ltq6h$)Qv`s_DFQ&|6agS}iU5!~MF7a0A^>Dg5dbpB9evZP zZwMH>8_HMR)X*33tx^ELzw-*s5NQP1W)%!^1@Zca!&*Adq*iMW4T@KcIjKaEwqxyT zX9y6CeJurKtv#j;E(;`>8k#6p5Wagg`ypttNIM&QfL3eg&T+?S^>lIAnw1o2!CLkm z1>mc-|Bv#QZ&p&+){rq`?2dO}dz)H&pRr}o2?~T)Zn21o1z4o1M2|+RK0JWYHF)%wAC&TK;MmvtA|wq^ z#rVhc(K}8%Swd$D7MGW6MNDj?-O+Tq99wM+MNtU83Z-u$1zk?`n;kV+!*-=L;1WdU1pK! za(*%Dur#%;owYB-yv7F$FdM)>J6(J%UxXlYvKQbJ85ZT!@kvG500000NkvXXu0mjf DS`cX( literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..05b87738f03e02eacc71cf724b8684e057a086b2 GIT binary patch literal 377 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 m2l!`ai;wk<5EM@F0(=AWK-(aNoV}v}0000Bi! z-a{4uhZO?hco;B&lPM;I2_*=;fw3MCWtauLL#_N9SMPurM?@(#qkSI_cRJ$L_d$(mfvT$TvMiEL(;;vQ z-!l-RY0#c4K-csEOM-JVgE7B=M<^6-2|x*Jh7jI`RBbglH?(b0Oq{A9