diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index 73082674736452..eef9ec07c0eb3e 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -1,8 +1,8 @@ - type: entity - name: space carp + name: carp plushie id: BaseMobCarp parent: [ SimpleSpaceMobBase, FlyingMobBase, MobCombat ] - description: It's a space carp. + description: An adorable stuffed toy that resembles the monstrous space carp. abstract: true components: - type: InputMover @@ -18,10 +18,10 @@ - SimpleHostile - type: Sprite drawdepth: Mobs - sprite: Mobs/Aliens/Carps/space.rsi + sprite: Objects/Fun/toys.rsi layers: - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive + state: carpplush - type: CombatMode - type: Physics - type: Fixtures @@ -45,11 +45,11 @@ - type: DamageStateVisuals states: Alive: - Base: alive - BaseUnshaded: mouth + Base: carpplush + BaseUnshaded: carpplush_mouth Dead: - Base: dead - BaseUnshaded: dead_mouth + Base: carpplush + BaseUnshaded: carpplush_mouth - type: Butcherable spawned: - id: FoodMeatFish @@ -87,36 +87,36 @@ - type: Sprite layers: - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive + state: carpplush - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] - state: mouth + state: carpplush_mouth shader: unshaded - type: RandomSprite available: - enum.DamageStateVisualLayers.Base: - alive: Rainbow + carpplush: Rainbow enum.DamageStateVisualLayers.BaseUnshaded: - mouth: "" + carpplush_mouth: "" - type: entity - name: magicarp + name: magicarp plushie parent: BaseMobCarp id: MobCarpMagic - description: Looks like some kind of fish. Might be magical. + description: Looks like some kind of fish plushie. Might be magical. components: - type: Sprite - sprite: Mobs/Aliens/Carps/magic.rsi + sprite: Objects/Fun/magicplush.rsi - type: TypingIndicator proto: guardian - type: entity - name: holocarp + name: holocarp plushie parent: BaseMobCarp id: MobCarpHolo - description: Carp made out of holographic energies. Sadly for you, it is very much real. + description: Plush carp made out of holographic energies. Luckily for you, it is very much real. components: - type: Sprite - sprite: Mobs/Aliens/Carps/holo.rsi + sprite: Objects/Fun/holoplush.rsi - type: Physics - type: Fixtures fixtures: @@ -135,8 +135,8 @@ - type: entity parent: MobCarp id: MobCarpRainbow - name: rainbow carp - description: Wow such a shiny fishie! + name: rainbow carp plushie + description: Wow such a shiny fish plushie! components: - type: PointLight radius: 1.5 @@ -152,7 +152,6 @@ - type: SalvageMobRestrictions - type: entity - name: space carp id: MobCarpDragon suffix: DragonBrood parent: MobCarp diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 902735bb303ad5..3ab2dbc6f2ff87 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -490,11 +490,16 @@ - type: entity parent: BasePlushie id: PlushieCarp - name: carp plushie - description: An adorable stuffed toy that resembles the monstrous space carp. + name: space carp + description: It's a space carp. components: - type: Sprite - state: carpplush + sprite: Mobs/Aliens/Carps/space.rsi + layers: + - state: alive + color: '#BB07F6' + - state: mouth + shader: unshaded - type: Item heldPrefix: carpplush storedRotation: -90 diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml index 2adce1e66b3b26..992fb251c77c4d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml @@ -154,7 +154,7 @@ parent: PlushieCarp id: DehydratedSpaceCarp name: dehydrated space carp - description: Looks like a plush toy carp, but just add water and it becomes a real-life space carp! + description: Looks like a regular space carp, but just add water and it becomes a real-life carp plushie! components: - type: SolutionContainerManager solutions: diff --git a/Resources/Textures/Objects/Fun/holoplush.rsi/carpplush.png b/Resources/Textures/Objects/Fun/holoplush.rsi/carpplush.png new file mode 100644 index 00000000000000..811bf9e649f176 Binary files /dev/null and b/Resources/Textures/Objects/Fun/holoplush.rsi/carpplush.png differ diff --git a/Resources/Textures/Objects/Fun/holoplush.rsi/carpplush_mouth.png b/Resources/Textures/Objects/Fun/holoplush.rsi/carpplush_mouth.png new file mode 100644 index 00000000000000..c33c17310326e9 Binary files /dev/null and b/Resources/Textures/Objects/Fun/holoplush.rsi/carpplush_mouth.png differ diff --git a/Resources/Textures/Objects/Fun/holoplush.rsi/meta.json b/Resources/Textures/Objects/Fun/holoplush.rsi/meta.json new file mode 100644 index 00000000000000..b4a80fbf7a3cdd --- /dev/null +++ b/Resources/Textures/Objects/Fun/holoplush.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Based on tgstation carpplush sprite, modified by deltanedas (github) for SS14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "carpplush", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "carpplush_mouth" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/magicplush.rsi/carpplush.png b/Resources/Textures/Objects/Fun/magicplush.rsi/carpplush.png new file mode 100644 index 00000000000000..950de931a0766b Binary files /dev/null and b/Resources/Textures/Objects/Fun/magicplush.rsi/carpplush.png differ diff --git a/Resources/Textures/Objects/Fun/magicplush.rsi/carpplush_mouth.png b/Resources/Textures/Objects/Fun/magicplush.rsi/carpplush_mouth.png new file mode 100644 index 00000000000000..c33c17310326e9 Binary files /dev/null and b/Resources/Textures/Objects/Fun/magicplush.rsi/carpplush_mouth.png differ diff --git a/Resources/Textures/Objects/Fun/magicplush.rsi/meta.json b/Resources/Textures/Objects/Fun/magicplush.rsi/meta.json new file mode 100644 index 00000000000000..872a9e8acf701e --- /dev/null +++ b/Resources/Textures/Objects/Fun/magicplush.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Based on tgstation carpplush sprite, modified by deltanedas (github) for SS14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "carpplush" + }, + { + "name": "carpplush_mouth" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/carpplush_mouth.png b/Resources/Textures/Objects/Fun/toys.rsi/carpplush_mouth.png new file mode 100644 index 00000000000000..c33c17310326e9 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/carpplush_mouth.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index ef50532eba7978..20061cfdd8f7ba 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -26,6 +26,9 @@ { "name": "carpplush" }, + { + "name": "carpplush_mouth" + }, { "name": "narplush" },