From 6ab7ecdd5318e8f35ca5425e2ef55d0ce9e0cabd Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Tue, 12 Dec 2023 03:03:47 -0500 Subject: [PATCH] Instruments, plushies, gunpet, and bibles. (#22398) * Some instrument sizes and gunpet sidearm * Cello * bagpipe * Crippling balance PR made bananium horn Small not Tiny * plushie and toy sizes. * Scroll bigger * Make bible same size as other books. * size rgb staff to other staffs. * add sprite update json --- .../Fun/Instruments/instruments_misc.yml | 8 ++++-- .../Fun/Instruments/instruments_string.yml | 4 ++- .../Fun/Instruments/instruments_wind.yml | 2 +- .../Entities/Objects/Fun/bike_horn.yml | 2 +- .../Prototypes/Entities/Objects/Fun/toys.yml | 26 ++++++++++++++++-- .../Entities/Objects/Magic/books.yml | 2 ++ .../Objects/Specific/Chapel/bibles.yml | 2 +- Resources/Prototypes/Magic/staves.yml | 1 + .../Textures/Objects/Fun/toys.rsi/meta.json | 3 ++ .../Fun/toys.rsi/plushie_lizard_mirrored.png | Bin 0 -> 262 bytes 10 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/plushie_lizard_mirrored.png diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml index 47ea5ab2f6..207af9ffcf 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml @@ -24,7 +24,7 @@ - type: Instrument program: 122 - type: Item - size: Small + size: Normal - type: entity parent: BaseHandheldInstrument @@ -38,7 +38,8 @@ - type: Instrument program: 123 - type: Item - size: Tiny + size: Small + storedRotation: 90 - type: entity parent: BaseHandheldInstrument @@ -102,10 +103,11 @@ sprite: Objects/Fun/Instruments/gunpet.rsi state: icon - type: Item - size: Normal + size: Small sprite: Objects/Fun/Instruments/gunpet.rsi - type: Tag tags: + - Sidearm - BrassInstrument - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml index 70d1444bc4..7224efa9e0 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml @@ -236,7 +236,9 @@ sprite: Objects/Fun/Instruments/cello.rsi state: icon - type: Item - size: Normal + size: Large + shape: + - 0,0,1,3 sprite: Objects/Fun/Instruments/cello.rsi - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml index afba6c2774..c8a098b586 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml @@ -171,7 +171,7 @@ sprite: Objects/Fun/Instruments/bagpipes.rsi state: icon - type: Item - size: Normal + size: Large sprite: Objects/Fun/Instruments/bagpipes.rsi - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml index 58b168e882..caf2b909c6 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml @@ -119,7 +119,7 @@ state: icon - type: Item sprite: Objects/Fun/bananiumhorn.rsi - size: Tiny + size: Small - type: Clothing sprite: Objects/Fun/bananiumhorn.rsi slots: [Belt] diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 71c5444dc3..789ba04e96 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -79,6 +79,8 @@ suffix: DO NOT MAP description: So soft it almost makes you want to take a nap... components: + - type: Item + size: Normal - type: Sprite sprite: Mobs/Ghosts/revenant.rsi state: icon @@ -97,6 +99,7 @@ sprite: Objects/Fun/toys.rsi state: plushie_h - type: Item + size: Normal sprite: Objects/Fun/toys.rsi heldPrefix: bee - type: Extractable @@ -201,6 +204,15 @@ soundHit: path: /Audio/Items/Toys/weh.ogg +- type: entity + parent: PlushieLizard + id: PlushieLizardMirrored + components: + - type: Item + size: Small + - type: Sprite + state: plushie_lizard_mirrored + - type: entity parent: BasePlushie id: PlushieSpaceLizard #ᵂᵉʰ! @@ -336,6 +348,8 @@ name: ratvar plushie description: A small stuffed doll of the elder god Ratvar. components: + - type: Item + size: Normal - type: Sprite state: plushie_ratvar @@ -345,6 +359,8 @@ name: nar'sie plushie description: A small stuffed doll of the elder goddess Nar'Sie. components: + - type: Item + size: Normal - type: Sprite state: narplush @@ -427,6 +443,8 @@ name: rubber ducky description: Not carried here by ocean currents. components: + - type: Item + size: Tiny - type: Sprite sprite: Objects/Fun/ducky.rsi state: icon @@ -473,6 +491,8 @@ name: xeno plushie description: An adorable stuffed toy that resembles a scary xenomorf. You're lucky it's just a toy. components: + - type: Item + size: Normal - type: Sprite state: plushie_xeno - type: EmitSoundOnUse @@ -547,6 +567,8 @@ name: ian toy description: Unable to eat, but just as fluffy as the real guy! components: + - type: Item + size: Tiny - type: Sprite state: ian - type: EmitSoundOnUse @@ -771,7 +793,7 @@ sprite: Objects/Fun/toys.rsi state: corgib - type: Item - size: Normal + size: Small sprite: Objects/Fun/toys.rsi heldPrefix: corgib - type: Damageable @@ -796,7 +818,7 @@ intensity: 2000 falloffPower: 2.6 - type: Item - size: Small + size: Normal sprite: Objects/Fun/toys.rsi heldPrefix: singularitytoy diff --git a/Resources/Prototypes/Entities/Objects/Magic/books.yml b/Resources/Prototypes/Entities/Objects/Magic/books.yml index 812949fb0b..89acd9e7da 100644 --- a/Resources/Prototypes/Entities/Objects/Magic/books.yml +++ b/Resources/Prototypes/Entities/Objects/Magic/books.yml @@ -92,6 +92,8 @@ name: scroll of runes parent: BaseSpellbook components: + - type: Item + size: Normal - type: Sprite sprite: Objects/Magic/magicactions.rsi layers: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml index ccd4d94236..6096de5c7c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml @@ -31,7 +31,7 @@ sprite: Objects/Specific/Chapel/bible.rsi state: icon - type: Item - size: Normal + size: Small sprite: Objects/Specific/Chapel/bible.rsi - type: Clothing slots: diff --git a/Resources/Prototypes/Magic/staves.yml b/Resources/Prototypes/Magic/staves.yml index 4713a838f8..5d894e0f41 100644 --- a/Resources/Prototypes/Magic/staves.yml +++ b/Resources/Prototypes/Magic/staves.yml @@ -17,6 +17,7 @@ actions: - ActionRgbLight - type: Item + size: Normal inhandVisuals: left: - state: staff-inhand-left diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index 7ab46a3108..00999ac01e 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -49,6 +49,9 @@ }, { "name": "plushie_lizard" + }, + { + "name": "plushie_lizard_mirrored" }, { "name": "plushie_lamp" diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_lizard_mirrored.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_lizard_mirrored.png new file mode 100644 index 0000000000000000000000000000000000000000..a8ad75da91d3c2283f2370b45b4465387e65e8ba GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv-2k5u*Z*ul76^E(R0~>Q9=5?e z@q$VE8Hc>1&TS7PR=lp-`mXiAg2I1W+yDRnH?#eh04ilH3GxeOaCmkj4ajNtba4#P zIG>y#5z?@C&mIO>hk!kMoCG@0{|MNyXHOu5r-Oh-K%?S?#+){n%F0T2W~T*qv6|@|cS6GJIhKvz8Db7hQCyt;U5~A$VPod;S9f=dEASYYnXz%{IL|nl zbZ6Sms_Q%|-Z56U($1Z6*tV7VMNZ0e;{p?&f))k_^L^UW7Vf(K6XX|9S3j3^P6D= literal 0 HcmV?d00001 -- 2.51.2