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

diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
index 47ea5ab2f60b45c54033532f255ff0396dce3b41..207af9ffcf9721a0cb442c68026c3c6bfa8566f7 100644 (file)
--- 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 70d1444bc4fbb90e01ba46e91c7fe65d888c5cd8..7224efa9e0231e13a507a08c3cc02f95d42e97c0 100644 (file)
--- 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 afba6c27740360105127066e0123c9e3ceaccfe7..c8a098b586e0a54a5e2ede8d3f569e32a117931d 100644 (file)
--- 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 58b168e88241bdf3de190ab715a05fac5c5841d8..caf2b909c605777ad48c69bfc21e14461fef4bc9 100644 (file)
--- 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 71c5444dc30ffb32982e139e24a0d89d27d00d71..789ba04e96a6c65d55454179ac78e513cc8a0227 100644 (file)
--- 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 812949fb0b9373ea68c625bc99c5b698bab5d073..89acd9e7dabf32e95ddfdfa12dbca9afdc4f1c08 100644 (file)
--- 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 ccd4d942366ff4a39a5f4dca3a1971a34045f26e..6096de5c7c7eb8935060eda979a14b271d9ef7ca 100644 (file)
--- 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 4713a838f844ebcd7fcbcf76df65e793c9bfe03a..5d894e0f416ea2d371f551f0278d8da3f6895a4a 100644 (file)
--- 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 7ab46a310831a3316c03b528511025223079fc3a..00999ac01e51cd61f1a6b2ad1cce4d972893555c 100644 (file)
--- 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 (file)
index 0000000..a8ad75d
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_lizard_mirrored.png differ