diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs index 15cf24d0f2..eda7149148 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs @@ -416,7 +416,7 @@ public sealed partial class AdminVerbSystem { Text = pinballName, Category = VerbCategory.Smite, - Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/toys.rsi"), "basketball"), + Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/Balls/basketball.rsi"), "icon"), Act = () => { var xform = Transform(args.Target); @@ -685,7 +685,7 @@ public sealed partial class AdminVerbSystem { Text = reptilianName, Category = VerbCategory.Smite, - Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/toys.rsi"), "plushie_lizard"), + Icon = new SpriteSpecifier.Rsi(new ("Textures/Objects/Fun/Plushies/lizard.rsi"), "icon"), Act = () => { _polymorphSystem.PolymorphEntity(args.Target, "AdminLizardSmite"); diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index db84ce3b2c..445e7d941b 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml @@ -91,7 +91,7 @@ - type: cargoProduct id: CrateFunFoamGuns icon: - sprite: Objects/Weapons/Guns/Rifles/foam_rifle.rsi + sprite: Objects/Fun/Foam/foam_rifle.rsi state: icon product: CrateFunFoamGuns cost: 3000 @@ -101,8 +101,8 @@ - type: cargoProduct id: FunPlushies icon: - sprite: Objects/Fun/toys.rsi - state: plushie_h + sprite: Objects/Fun/Plushies/human.rsi + state: icon product: CrateFunPlushie cost: 1000 category: cargoproduct-category-name-fun @@ -111,8 +111,8 @@ - type: cargoProduct id: FunLizardPlushies icon: - sprite: Objects/Fun/toys.rsi - state: plushie_lizard + sprite: Objects/Fun/Plushies/lizard.rsi + state: icon product: CrateFunLizardPlushieBulk cost: 500 category: cargoproduct-category-name-fun @@ -121,7 +121,7 @@ - type: cargoProduct id: FunSharkPlushies icon: - sprite: Objects/Fun/sharkplush.rsi + sprite: Objects/Fun/Plushies/shark.rsi state: blue product: CrateFunSharkPlushieBulk cost: 500 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/nukies.yml b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/nukies.yml index 9ee323b470..16f3d4d460 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/nukies.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/nukies.yml @@ -7,5 +7,5 @@ - type: Sprite layers: - state: green - - sprite: Objects/Fun/toys.rsi - state: synb \ No newline at end of file + - sprite: Objects/Fun/Balloons/syndicate.rsi + state: icon diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index 48e8b1a178..f77712839c 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -6,8 +6,8 @@ - type: Sprite layers: - state: red - - sprite: Objects/Fun/toys.rsi - state: plushie_h + - sprite: Objects/Fun/Plushies/bee.rsi + state: icon - type: RandomSpawner rarePrototypes: - FoamBlade @@ -101,7 +101,7 @@ - ToyFigurineLawyer - ToyFigurineCargoTech - ToyFigurineSalvage - - ToyFigurineQuartermaster + - ToyFigurineQuartermaster - ToyFigurineChiefEngineer - ToyFigurineAtmosTech - ToyFigurineEngineer diff --git a/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml b/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml index 9a7a1ab4fb..e57223e1b4 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml @@ -119,7 +119,7 @@ description: SHARK TORNADO! components: - type: Sprite - sprite: Objects/Fun/sharkplush.rsi + sprite: Objects/Fun/Plushies/shark.rsi state: blue rotation: 90 noRot: false @@ -190,6 +190,6 @@ description: WEH! components: - type: Sprite - sprite: Objects/Fun/toys.rsi - state: plushie_lizard + sprite: Objects/Fun/Plushies/lizard.rsi + state: icon noRot: false diff --git a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml new file mode 100644 index 0000000000..eeef773f31 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml @@ -0,0 +1,1146 @@ +## Plushies + +- type: entity + abstract: true + parent: [BaseItem, BaseStash] + id: BasePlushie + components: + - type: EmitSoundOnUse + sound: + collection: ToySqueak + - type: EmitSoundOnActivate + sound: + collection: ToySqueak + - type: EmitSoundOnCollide + sound: + collection: ToySqueak + - type: EmitSoundOnLand + sound: + collection: ToyFall + - type: EmitSoundOnTrigger + sound: + collection: ToySqueak + - type: UseDelay + delay: 1.0 + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + collection: ToySqueak + damage: + types: + Blunt: 0 + hidden: true + - type: PhysicalComposition + materialComposition: + Cloth: 100 + - type: StaticPrice + price: 5 + - type: Food + requiresSpecialDigestion: true + useSound: + collection: ToySqueak + delay: 2 + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Fiber + Quantity: 10 + - type: Tag + tags: + - Payload + - ClothMade + +- type: entity + parent: BasePlushie + id: PlushieThrongler + name: throngler plushie + description: A stuffed toy to remind cargo techs of what they can no longer have. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/ThronglerPlushie.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 10 + - type: Item + size: Ginormous + sprite: Objects/Weapons/Melee/Throngler-in-hand.rsi + - type: FoodSequenceElement + entries: + CottonBurger: ThronglerPlushie + + +- type: entity + parent: BasePlushie + id: PlushieGhost + name: ghost soft toy + description: The start of your personal GHOST GANG! + components: + - type: Sprite + sprite: Mobs/Ghosts/ghost_human.rsi + state: icon + noRot: true + - type: Item + - type: Physics + angularDamping: 0.02 + linearDamping: 0.02 + fixedRotation: true + bodyType: Dynamic + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.25,0.25,0.25" + density: 20 + mask: + - ItemMask + restitution: 0.98 + friction: 0.01 + - type: TileFrictionModifier + modifier: 0.1 + - type: RandomWalk + accumulatorRatio: 0.5 + maxSpeed: 1 + minSpeed: 0.25 + - type: FoodSequenceElement + entries: + CottonBurger: GhostPlushie + - type: Tag + tags: + - ForceableFollow + - PlushieGhost + - Payload + +- type: entity + parent: PlushieGhost + id: PlushieGhostRevenant + categories: [ DoNotMap ] + name: revenant soft toy + description: So soft it almost makes you want to take a nap... + components: + - type: Sprite + sprite: Mobs/Ghosts/revenant.rsi + state: icon + noRot: true + - type: Item + size: Normal + - type: Construction + graph: PlushieGhostRevenant + node: plushie + - type: FoodSequenceElement + entries: + CottonBurger: RevenantPlushie + +- type: entity + parent: BasePlushie + id: PlushieBee + name: bee plushie + description: A cute toy that resembles an even cuter programmer. You'd have to be a monster to grind this up. + components: + - type: Sprite + sprite: Objects/Fun/Plushies/bee.rsi + state: icon + - type: Item + size: Normal + sprite: Objects/Fun/Plushies/bee.rsi + - type: Extractable + grindableSolutionName: bee + - type: SolutionContainerManager + solutions: + bee: + reagents: + - ReagentId: GroundBee + Quantity: 10 + food: + maxVol: 10 + reagents: + - ReagentId: GroundBee + Quantity: 5 + - ReagentId: Fiber + Quantity: 5 + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/bee.rsi + slots: + - HEAD + - type: FoodSequenceElement + entries: + CottonBurger: BeePlushie + +- type: entity + parent: BasePlushie + id: PlushieHampter + name: hampter plushie + description: A cute stuffed toy that resembles a hamster. Its face looks squished. + components: + - type: Sprite + sprite: Objects/Fun/Plushies/hampter.rsi + state: icon + - type: EmitSoundOnUse + sound: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: FoodSequenceElement + entries: + CottonBurger: HamptrPlushie + +- type: entity + parent: PlushieBee + id: PlushieRGBee + name: RGBee plushie + description: A cute toy that resembles a bee plushie while you're on LSD. + components: + - type: PointLight + radius: 1.5 + energy: 2 + - type: RgbLightController + layers: [ 0 ] + - type: Item + inhandVisuals: + left: + - state: inhand-left + shader: unshaded + right: + - state: inhand-right + shader: unshaded + - type: Clothing + clothingVisuals: + head: + - state: equipped-HELMET + shader: unshaded + +- type: entity + parent: BasePlushie + id: PlushieNuke + name: nukie plushie + description: A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious. + components: + - type: Sprite + sprite: Objects/Fun/Plushies/nukie.rsi + state: icon + - type: FoodSequenceElement + entries: + CottonBurger: NukiePlushie + +- type: entity + parent: BasePlushie + id: PlushieRouny + name: rouny plushie + description: Rouny. + components: + - type: Sprite + sprite: Objects/Fun/Plushies/rouny.rsi + state: icon + - type: Rotatable + - type: FoodSequenceElement + entries: + CottonBurger: RounyPlushie + +- type: entity + parent: BasePlushie + id: PlushieLamp + name: lamp plushie + description: A light emitting friend! + components: + - type: Sprite + sprite: Objects/Fun/Plushies/lamp.rsi + state: icon + - type: PointLight + radius: 1.5 + energy: 2 + netsync: false + - type: FoodSequenceElement + entries: + CottonBurger: LampPlushie + +- type: entity + parent: BasePlushie + id: PlushieArachind + name: arachnid plushie + description: An adorable stuffed toy that resembles an arachnid. It feels silky.. + components: + - type: Sprite + sprite: Objects/Fun/Plushies/arachnid.rsi + state: icon + - type: EmitSoundOnUse + sound: + path: /Audio/Voice/Arachnid/arachnid_laugh.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Voice/Arachnid/arachnid_laugh.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Voice/Arachnid/arachnid_laugh.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Voice/Arachnid/arachnid_laugh.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Voice/Arachnid/arachnid_laugh.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Voice/Arachnid/arachnid_laugh.ogg + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + path: /Audio/Voice/Arachnid/arachnid_laugh.ogg + - type: FoodSequenceElement + entries: + CottonBurger: ArachnidPlushie + +- type: entity + parent: BasePlushie + id: PlushieLizard #Weh! + name: lizard plushie + description: An adorable stuffed toy that resembles a lizardperson. Made by CentComm as a token initiative to combat speciesism in work environments. "Welcome your new colleagues as you do this plush, with open arms!" + components: + - type: Sprite + sprite: Objects/Fun/Plushies/lizard.rsi + state: icon + - type: Item + sprite: Objects/Fun/Plushies/lizard.rsi + - type: EmitSoundOnUse + sound: + path: /Audio/Items/Toys/weh.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Items/Toys/weh.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Items/Toys/weh.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Items/Toys/weh.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Items/Toys/weh.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/weh.ogg + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + path: /Audio/Items/Toys/weh.ogg + - type: Extractable + juiceSolution: + reagents: + - ReagentId: JuiceThatMakesYouWeh + Quantity: 30 + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Fiber + Quantity: 10 + - ReagentId: JuiceThatMakesYouWeh + Quantity: 10 + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/lizard.rsi + slots: + - HEAD + - type: Speech + speechVerb: Reptilian # for pais (In the secret stash) + - type: FoodSequenceElement + entries: + CottonBurger: LizardPlushie + - type: Tag + tags: + - Payload + - ClothMade + - PlushieLizard + +- type: entity + parent: BasePlushie + id: PlushieExperiment #Arf! + name: experiment plushie + description: A plushie of a canid of sorts, it yearns to be detonated on a landmine. + components: + - type: Sprite + sprite: Objects/Fun/Plushies/expi.rsi + state: icon + - type: Item + sprite: Objects/Fun/Plushies/expi.rsi + inhandVisuals: + left: + - state: inhand-left + shader: shaded + right: + - state: inhand-right + shader: shaded + - type: EmitSoundOnUse + sound: + path: /Audio/Items/Toys/arf.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Items/Toys/arf.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Items/Toys/arf.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Items/Toys/arf.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Items/Toys/arf.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/arf.ogg + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + path: /Audio/Items/Toys/arf.ogg + - type: Clothing + clothingVisuals: + head: + - state: equipped-HELMET + shader: shaded + quickEquip: false + sprite: Objects/Fun/Plushies/expi.rsi + slots: + - HEAD + - type: FoodSequenceElement + entries: + CottonBurger: ExperimentPlushie + - type: Tag + tags: + - Payload + - ClothMade + +- type: entity + parent: PlushieLizard + id: PlushieRainbowLizard #Weh but gay + name: rainbow lizard plushie + description: An adorable stuffed toy that resembles a lizardperson of every color. You just might trip while staring at it... + components: + - type: Sprite + state: rainbowlizardplush + - type: PointLight + radius: 1.5 + energy: 2 + - type: RgbLightController + layers: [ 0 ] + - type: Clothing + clothingVisuals: + head: + - state: lizard-equipped-HELMET + shader: unshaded + - type: Item + inhandVisuals: + left: + - state: rainbowlizardplush-inhand-left + shader: unshaded + right: + - state: rainbowlizardplush-inhand-right + shader: unshaded + +- type: entity + parent: PlushieLizard + id: PlushieLizardMirrored + suffix: Mirrored + components: + - type: Sprite + state: icon + scale: -1, 1 + +- type: entity + parent: PlushieLizard + id: PlushieSpaceLizard #ᵂᵉʰ! + name: space lizard plushie + description: An adorable stuffed toy that resembles a lizardperson in an EVA suit. Made by CentComm as a token initiative to combat speciesism in space environments. "Welcome your new colleges as you do this plush, with open arms!" + components: + - type: Sprite + sprite: Objects/Fun/Plushies/lizard.rsi + state: plushie_spacelizard + - type: Item + sprite: Objects/Fun/Plushies/lizard.rsi + heldPrefix: spacelizard + - type: EmitSoundOnUse + sound: + path: /Audio/Items/Toys/muffled_weh.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Items/Toys/muffled_weh.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Items/Toys/muffled_weh.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Items/Toys/muffled_weh.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Items/Toys/muffled_weh.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/muffled_weh.ogg + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + path: /Audio/Items/Toys/muffled_weh.ogg + - type: Clothing + sprite: Objects/Fun/Plushies/lizard.rsi + slots: + - HEAD + quickEquip: false + clothingVisuals: + head: + - state: spacelizard-equipped-HELMET + offset: "0, 0.03" + - type: FoodSequenceElement + entries: + CottonBurger: SpaceLizardPlushie + +- type: entity + parent: PlushieLizard + id: PlushieLizardInversed #Hew! + name: drazil plushie + description: An adorable stuffed toy that resembles a lizardperson from an inversed dimension. Hew! + components: + - type: Sprite + state: plushie_lizard_inversed + - type: Item + heldPrefix: plushielizardinversed + - type: EmitSoundOnUse + sound: + path: /Audio/Items/Toys/hew.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Items/Toys/hew.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Items/Toys/hew.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Items/Toys/hew.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/hew.ogg + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + path: /Audio/Items/Toys/hew.ogg + - type: Extractable + juiceSolution: + reagents: + - ReagentId: JuiceThatMakesYouHew + Quantity: 30 + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Fiber + Quantity: 10 + - ReagentId: JuiceThatMakesYouHew + Quantity: 10 + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/lizard.rsi + equippedPrefix: lizard-inversed + slots: + - HEAD + - type: FoodSequenceElement + entries: + CottonBurger: InversedLizardPlushie + + +- type: entity + parent: BasePlushie + id: PlushieDiona + name: diona plushie + description: An adorable stuffed toy that resembles a diona. Love water and cuddles. Do not wet! + components: + - type: Sprite + sprite: Objects/Fun/Plushies/diona.rsi + layers: + - state: plushie_diona + - state: plushie_diona1 + map: [ "enum.SolutionContainerLayers.Fill" ] + visible: false + - type: EmitSoundOnUse + sound: + path: /Audio/Items/Toys/toy_rustle.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Items/Toys/toy_rustle.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Items/Toys/toy_rustle.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Items/Toys/toy_rustle.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Items/Toys/toy_rustle.ogg + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + path: /Audio/Items/Toys/toy_rustle.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/toy_rustle.ogg + - type: SolutionContainerManager + solutions: + plushie: + maxVol: 1 + food: + maxVol: 10 + reagents: + - ReagentId: Fiber + Quantity: 10 + - type: RefillableSolution + solution: plushie + - type: SolutionContainerVisuals + solutionName: plushie + maxFillLevels: 1 + fillBaseName: plushie_diona + changeColor: false + - type: Appearance + - type: Reactive + reactions: + - reagents: [ Water ] + methods: [ Touch ] + effects: + - !type:AddToSolutionReaction + solution: plushie + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.3,0.3,0.3" + density: 15 + mask: + - ItemMask + rehydrate: + shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.3,0.3,0.3" + hard: false + layer: + - LowImpassable + - type: CollisionWake + enabled: false + - type: FoodSequenceElement + entries: + CottonBurger: DionaPlushie + +- 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/Plushies/shark.rsi + state: blue + - type: EmitSoundOnLand + sound: + path: /Audio/Items/Toys/rawr.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Items/Toys/rawr.ogg + - type: EmitSoundOnUse + sound: + path: /Audio/Items/Toys/rawr.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Items/Toys/rawr.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Items/Toys/rawr.ogg + - type: MeleeWeapon + wideAnimationRotation: 90 + soundHit: + path: /Audio/Items/Toys/rawr.ogg + animation: WeaponArcBite + - type: Item + heldPrefix: blue + storedRotation: -90 + - type: FoodSequenceElement + entries: + CottonBurger: BlueSharkPlushie + - type: Tag + tags: + - PlushieSharkBlue + - Payload + - ClothMade + +- type: entity + parent: PlushieSharkBlue + id: PlushieSharkPink + name: pink shark soft toy + description: Hehe shonk :) + components: + - type: Sprite + sprite: Objects/Fun/Plushies/shark.rsi + state: pink + - type: Item + heldPrefix: pink + - type: FoodSequenceElement + entries: + CottonBurger: PinkSharkPlushie + - type: Tag + tags: + - PlushieSharkPink + - Payload + - ClothMade + +- 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/Plushies/shark.rsi + state: grey + - type: Item + heldPrefix: grey + - type: FoodSequenceElement + entries: + CottonBurger: GreySharkPlushie + - type: Tag + tags: + - PlushieSharkGrey + - Payload + - ClothMade + +- type: entity + parent: BasePlushie + id: PlushieRatvar + name: ratvar plushie + description: A small stuffed doll of the elder god Ratvar. + components: + - type: Sprite + sprite: Objects/Fun/Plushies/ratvar.rsi + state: icon + - type: Item + size: Normal + sprite: Objects/Fun/Plushies/ratvar.rsi + - type: FoodSequenceElement + entries: + CottonBurger: RatvarPlushie + +- type: entity + parent: BasePlushie + id: PlushieNar + name: nar'sie plushie + description: A small stuffed doll of the elder goddess Nar'Sie. + components: + - type: Sprite + sprite: Objects/Fun/Plushies/narsie.rsi + state: icon + - type: Item + size: Normal + sprite: Objects/Fun/Plushies/narsie.rsi + - type: FoodSequenceElement + entries: + CottonBurger: NarPlushie + +- type: entity + parent: BasePlushie + id: PlushieCarp + name: carp plushie + description: An adorable stuffed toy that resembles the monstrous space carp. + components: + - type: Sprite + sprite: Objects/Fun/Plushies/carp.rsi + state: carpplush + - type: Item + sprite: Objects/Fun/Plushies/carp.rsi + heldPrefix: carpplush + storedRotation: -90 + - type: EmitSoundOnUse + sound: + path: /Audio/Effects/bite.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Effects/bite.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Effects/bite.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Effects/bite.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Effects/bite.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Effects/bite.ogg + - type: MeleeWeapon + wideAnimationRotation: 90 + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite # Rrrr! + - type: FoodSequenceElement + entries: + CottonBurger: CarpPlushie + - type: Tag + tags: + - Payload + - ClothMade + - PlushieCarp + +- type: entity + parent: PlushieCarp + id: PlushieMagicarp + name: magicarp plushie + description: An adorable stuffed toy resembling the exceedingly rare magicarp. + components: + - type: Sprite + state: magicplush + - type: FoodSequenceElement + entries: + CottonBurger: MagicarpPlushie + +- type: entity + parent: PlushieCarp + id: PlushieRainbowCarp + name: rainbow carp plushie + description: An adorable stuffed toy resembling the legendary rainbow carp. + components: + - type: Sprite + state: rainbowcarpplush + - type: PointLight + radius: 1.5 + energy: 2 + - type: RgbLightController + layers: [ 0 ] + - type: Item + inhandVisuals: + left: + - state: rainbowcarpplush-inhand-left + shader: unshaded + right: + - state: rainbowcarpplush-inhand-right + shader: unshaded + +- type: entity + parent: PlushieCarp + id: PlushieHolocarp + name: holocarp plushie + description: A holographic stuffed toy resembling science's nemesis - the holocarp. + components: + - type: Sprite + state: holoplush + - type: FoodSequenceElement + entries: + CottonBurger: HolocarpPlushie + +- type: entity + parent: BasePlushie + id: PlushieSlime + name: slime plushie + description: An adorable stuffed toy that resembles a slime. It's basically a hacky sack. + components: + - type: Sprite + sprite: Objects/Fun/Plushies/slime.rsi + state: icon + - type: EmitSoundOnUse + sound: + path: /Audio/Voice/Slime/slime_squish.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Voice/Slime/slime_squish.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Voice/Slime/slime_squish.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Voice/Slime/slime_squish.ogg + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + path: /Audio/Voice/Slime/slime_squish.ogg + - type: FoodSequenceElement + entries: + CottonBurger: SlimePlushie + +- type: entity + parent: BasePlushie + id: PlushieSnake + name: snake plushie + description: An adorable stuffed toy that resembles a snake. + components: + - type: Sprite + sprite: Objects/Fun/Plushies/snake.rsi + state: icon + - type: Item + heldPrefix: plushiesnake + - type: EmitSoundOnUse + sound: + path: /Audio/Items/Toys/rattle.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Items/Toys/rattle.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Items/Toys/rattle.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Items/Toys/rattle.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Items/Toys/rattle.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/rattle.ogg + - type: MeleeWeapon + wideAnimationRotation: 90 + soundHit: + path: /Audio/Items/Toys/rattle.ogg + - type: Clothing + sprite: Objects/Fun/Plushies/snake.rsi + quickEquip: false + slots: + - NECK + - type: Speech + speechVerb: Reptilian # for pais (In the secret stash) + - type: FoodSequenceElement + entries: + CottonBurger: SnakePlushie + +- type: entity + parent: BasePlushie + id: ToyMouse + name: mouse toy + description: A colorful toy mouse! + components: + - type: Sprite + sprite: Objects/Fun/toy_mouse.rsi + state: icon + - type: EmitSoundOnUse + sound: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: MeleeWeapon + wideAnimationRotation: -90 + soundHit: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: Clothing + quickEquip: false + sprite: Objects/Fun/toy_mouse.rsi + slots: + - HEAD + - type: FoodSequenceElement + entries: + CottonBurger: MousePlushie + +- type: entity + parent: BasePlushie + id: PlushieVox + name: vox plushie + description: SKREEEEEEEEEEEE! + components: + - type: Sprite + sprite: Objects/Fun/Plushies/vox.rsi + state: icon + - type: EmitSoundOnUse + sound: + path: /Audio/Voice/Vox/shriek1.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Voice/Vox/shriek1.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Voice/Vox/shriek1.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Voice/Vox/shriek1.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Voice/Vox/shriek1.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Voice/Vox/shriek1.ogg + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + path: /Audio/Voice/Vox/shriek1.ogg + - type: FoodSequenceElement + entries: + CottonBurger: VoxPlushie + +- type: entity + parent: BasePlushie + id: PlushieAtmosian + name: atmosian plushie + description: An adorable stuffed toy that resembles a brave atmosian. Unfortunately, he won't fix those depressurizations for you. + components: + - type: Sprite + sprite: Objects/Fun/Plushies/atmosian.rsi + state: icon + - type: FoodSequenceElement + entries: + CottonBurger: AtmosianPlushie + +- type: entity + parent: BasePlushie + id: PlushieXeno + name: xeno plushie + description: An adorable stuffed toy that resembles a scary xenomorf. You're lucky it's just a toy. + components: + - type: Sprite + sprite: Objects/Fun/Plushies/xeno.rsi + state: icon + - type: Item + size: Normal + - type: EmitSoundOnUse + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/mousesqueek.ogg + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: FoodSequenceElement + entries: + CottonBurger: XenoPlushie + +- type: entity + parent: BasePlushie + id: PlushiePenguin + name: penguin plushie + description: I use arch btw! + components: + - type: Sprite + sprite: Objects/Fun/Plushies/penguin.rsi + state: icon + - type: FoodSequenceElement + entries: + CottonBurger: PenguinPlushie + +- type: entity + parent: BasePlushie + id: PlushieHuman + name: human plushie + description: This is a felt plush of a human. All craftsmanship is of the lowest quality. The human is naked. The human is crying. The human is screaming. + components: + - type: Sprite + sprite: Objects/Fun/Plushies/human.rsi + state: icon + - type: EmitSoundOnUse + sound: + path: /Audio/Voice/Human/malescream_1.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Voice/Human/malescream_2.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Voice/Human/malescream_3.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Voice/Human/malescream_4.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Voice/Human/malescream_1.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/Voice/Human/malescream_4.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Voice/Human/malescream_5.ogg + - type: FoodSequenceElement + entries: + CottonBurger: HumanPlushie + +- type: entity + parent: BasePlushie + id: PlushieMoth + name: moth plushie + description: Cute and fluffy moth plushie. Enjoy, bz! + components: + - type: Sprite + sprite: Objects/Fun/Plushies/moth.rsi + state: icon + - type: EmitSoundOnUse + sound: + path: /Audio/Voice/Moth/moth_chitter.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Voice/Moth/moth_chitter.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Voice/Moth/moth_chitter.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Voice/Moth/moth_chitter.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Voice/Moth/moth_chitter.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/Voice/Moth/moth_chitter.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Voice/Moth/moth_chitter.ogg + - type: FoodSequenceElement + entries: + CottonBurger: MothPlushie diff --git a/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml b/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml index 88f0758874..4380184c26 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml @@ -5,8 +5,8 @@ description: Throw it at the floor and listen to it POP! components: - type: Sprite - sprite: Objects/Fun/toys.rsi - state: snappop + sprite: Objects/Fun/snap_pops.rsi + state: icon - type: Item size: Tiny - type: Damageable @@ -43,8 +43,8 @@ - type: Item size: Normal - type: Sprite - sprite: Objects/Fun/toys.rsi - state: spbox + sprite: Objects/Fun/snap_pops.rsi + state: box - type: Storage grid: - 0,0,4,3 diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index fd3fa27e68..495d044f01 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -11,7 +11,7 @@ blacklist: components: - SecretStash # Prevents being able to insert plushies inside each other (infinite plush)! - - NukeDisk # Could confuse the nukies if they don't know that plushies have a stash. + - NukeDisk # Could confuse the Nukies if they don't know that plushies have a stash. tags: - QuantumSpinInverter # It will cause issues with the grinder... - FakeNukeDisk # So you can't tell if the nuke disk is real or fake depending on if it can be inserted or not. @@ -23,1150 +23,6 @@ containers: stash: !type:ContainerSlot {} -## Plushies - -- type: entity - parent: [BaseItem, BaseStash] - id: BasePlushie - abstract: true - components: - - type: Sprite - sprite: Objects/Fun/toys.rsi - - type: Tag - tags: - - Payload - - ClothMade - - type: EmitSoundOnUse - sound: - collection: ToySqueak - - type: EmitSoundOnActivate - sound: - collection: ToySqueak - - type: EmitSoundOnCollide - sound: - collection: ToySqueak - - type: EmitSoundOnLand - sound: - collection: ToyFall - - type: EmitSoundOnTrigger - sound: - collection: ToySqueak - - type: UseDelay - delay: 1.0 - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - collection: ToySqueak - damage: - types: - Blunt: 0 - hidden: true - - type: PhysicalComposition - materialComposition: - Cloth: 100 - - type: StaticPrice - price: 5 - - type: Food - requiresSpecialDigestion: true - useSound: - collection: ToySqueak - delay: 2 - - type: SolutionContainerManager - solutions: - food: - maxVol: 10 - reagents: - - ReagentId: Fiber - Quantity: 10 - - -- type: entity - parent: BasePlushie - id: PlushieThrongler - name: throngler plushie - description: A stuffed toy to remind cargo techs of what they can no longer have. - components: - - type: Sprite - sprite: Objects/Weapons/Melee/ThronglerPlushie.rsi - state: icon - - type: MeleeWeapon - wideAnimationRotation: -135 - attackRate: 10 - - type: Item - size: Ginormous - sprite: Objects/Weapons/Melee/Throngler-in-hand.rsi - - type: FoodSequenceElement - entries: - CottonBurger: ThronglerPlushie - - -- type: entity - parent: BasePlushie - id: PlushieGhost - name: ghost soft toy - description: The start of your personal GHOST GANG! - components: - - type: Sprite - sprite: Mobs/Ghosts/ghost_human.rsi - state: icon - noRot: true - - type: Item - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.25,-0.25,0.25,0.25" - density: 20 - mask: - - ItemMask - restitution: 0.98 - friction: 0.01 - - type: Physics - angularDamping: 0.02 - linearDamping: 0.02 - fixedRotation: true - bodyType: Dynamic - - type: TileFrictionModifier - modifier: 0.1 - - type: Tag - tags: - - ForceableFollow - - PlushieGhost - - Payload - - type: RandomWalk - accumulatorRatio: 0.5 - maxSpeed: 1 - minSpeed: 0.25 - - type: FoodSequenceElement - entries: - CottonBurger: GhostPlushie - -- type: entity - parent: PlushieGhost - id: PlushieGhostRevenant - name: revenant soft toy - categories: [ DoNotMap ] - 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 - noRot: true - - type: Construction - graph: PlushieGhostRevenant - node: plushie - - type: FoodSequenceElement - entries: - CottonBurger: RevenantPlushie - -- type: entity - parent: BasePlushie - id: PlushieBee - name: bee plushie - description: A cute toy that resembles an even cuter programmer. You'd have to be a monster to grind this up. - components: - - type: Sprite - sprite: Objects/Fun/toys.rsi - state: plushie_h - - type: Item - size: Normal - sprite: Objects/Fun/toys.rsi - heldPrefix: bee - - type: Extractable - grindableSolutionName: bee - - type: SolutionContainerManager - solutions: - bee: - reagents: - - ReagentId: GroundBee - Quantity: 10 - food: - maxVol: 10 - reagents: - - ReagentId: GroundBee - Quantity: 5 - - ReagentId: Fiber - Quantity: 5 - - type: Clothing - quickEquip: false - sprite: Objects/Fun/toys.rsi - equippedPrefix: bee - slots: - - HEAD - - type: FoodSequenceElement - entries: - CottonBurger: BeePlushie - -- type: entity - parent: BasePlushie - id: PlushieHampter - name: hampter plushie - description: A cute stuffed toy that resembles a hamster. Its face looks squished. - components: - - type: Sprite - state: plushie_hampter - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/mousesqueek.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/mousesqueek.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/mousesqueek.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/mousesqueek.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Items/Toys/mousesqueek.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/mousesqueek.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Items/Toys/mousesqueek.ogg - - type: FoodSequenceElement - entries: - CottonBurger: HamptrPlushie - -- type: entity - parent: PlushieBee - id: PlushieRGBee - name: RGBee plushie - description: A cute toy that resembles a bee plushie while you're on LSD. - components: - - type: PointLight - radius: 1.5 - energy: 2 - - type: RgbLightController - layers: [ 0 ] - - type: Item - inhandVisuals: - left: - - state: bee-inhand-left - shader: unshaded - right: - - state: bee-inhand-right - shader: unshaded - - type: Clothing - clothingVisuals: - head: - - state: bee-equipped-HELMET - shader: unshaded - -- type: entity - parent: BasePlushie - id: PlushieNuke - name: nukie plushie - description: A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious. - components: - - type: Sprite - state: plushie_nuke - - type: FoodSequenceElement - entries: - CottonBurger: NukiePlushie - -- type: entity - parent: BasePlushie - id: PlushieRouny - name: rouny plushie - description: Rouny. - components: - - type: Sprite - state: plushie_rouny - - type: Rotatable - - type: FoodSequenceElement - entries: - CottonBurger: RounyPlushie - -- type: entity - parent: BasePlushie - id: PlushieLamp - name: lamp plushie - description: A light emitting friend! - components: - - type: Sprite - state: plushie_lamp - - type: PointLight - radius: 1.5 - energy: 2 - netsync: false - - type: FoodSequenceElement - entries: - CottonBurger: LampPlushie - -- type: entity - parent: BasePlushie - id: PlushieArachind - name: arachnid plushie - description: An adorable stuffed toy that resembles an arachnid. It feels silky.. - components: - - type: Sprite - state: plushie_arachnid - - type: EmitSoundOnUse - sound: - path: /Audio/Voice/Arachnid/arachnid_laugh.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Voice/Arachnid/arachnid_laugh.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Voice/Arachnid/arachnid_laugh.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Voice/Arachnid/arachnid_laugh.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Voice/Arachnid/arachnid_laugh.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Voice/Arachnid/arachnid_laugh.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Voice/Arachnid/arachnid_laugh.ogg - - type: FoodSequenceElement - entries: - CottonBurger: ArachnidPlushie - -- type: entity - parent: BasePlushie - id: PlushieLizard #Weh! - name: lizard plushie - description: An adorable stuffed toy that resembles a lizardperson. Made by CentComm as a token initiative to combat speciesism in work environments. "Welcome your new colleagues as you do this plush, with open arms!" - components: - - type: Sprite - sprite: Objects/Fun/toys.rsi - state: plushie_lizard - - type: Item - heldPrefix: plushielizard - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/weh.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/weh.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/weh.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/weh.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Items/Toys/weh.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/weh.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Items/Toys/weh.ogg - - type: Extractable - juiceSolution: - reagents: - - ReagentId: JuiceThatMakesYouWeh - Quantity: 30 - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Fiber - Quantity: 10 - - ReagentId: JuiceThatMakesYouWeh - Quantity: 10 - - type: Clothing - quickEquip: false - sprite: Objects/Fun/toys.rsi - equippedPrefix: lizard - slots: - - HEAD - - type: Speech - speechVerb: Reptilian # for pais (In the secret stash) - - type: Tag - tags: - - ClothMade - - Payload - - PlushieLizard - - type: FoodSequenceElement - entries: - CottonBurger: LizardPlushie - -- type: entity - parent: BasePlushie - id: PlushieExperiment #Arf! - name: experiment plushie - description: A plushie of a canid of sorts, it yearns to be detonated on a landmine. - components: - - type: Sprite - sprite: Objects/Fun/expiplush.rsi - state: expi - - type: Item - inhandVisuals: - left: - - state: expi-inhand-left - shader: shaded - right: - - state: expi-inhand-right - shader: shaded - heldPrefix: plushielizard - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/arf.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/arf.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/arf.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/arf.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Items/Toys/arf.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/arf.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Items/Toys/arf.ogg - - type: Tag - tags: - - ClothMade - - Payload - - type: Clothing - clothingVisuals: - head: - - state: expi-equipped-HELMET - shader: shaded - quickEquip: false - sprite: Objects/Fun/toys.rsi - equippedPrefix: expi - slots: - - HEAD - - type: FoodSequenceElement - entries: - CottonBurger: ExperimentPlushie - -- type: entity - parent: PlushieLizard - id: PlushieRainbowLizard #Weh but gay - description: An adorable stuffed toy that resembles a lizardperson of every color. You just might trip while staring at it... - name: rainbow lizard plushie - components: - - type: Sprite - state: rainbowlizardplush - - type: PointLight - radius: 1.5 - energy: 2 - - type: RgbLightController - layers: [ 0 ] - - type: Clothing - clothingVisuals: - head: - - state: lizard-equipped-HELMET - shader: unshaded - - type: Item - inhandVisuals: - left: - - state: rainbowlizardplush-inhand-left - shader: unshaded - right: - - state: rainbowlizardplush-inhand-right - shader: unshaded - -- type: entity - parent: PlushieLizard - id: PlushieLizardMirrored - components: - - type: Item - size: Small - - type: Sprite - state: plushie_lizard - scale: -1, 1 - -- type: entity - parent: BasePlushie - id: PlushieSpaceLizard #ᵂᵉʰ! - name: space lizard plushie - description: An adorable stuffed toy that resembles a lizardperson in an EVA suit. Made by CentComm as a token initiative to combat speciesism in space environments. "Welcome your new colleges as you do this plush, with open arms!" - components: - - type: Item - heldPrefix: spacelizard - - type: Sprite - state: plushie_spacelizard - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/muffled_weh.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/muffled_weh.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/muffled_weh.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/muffled_weh.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Items/Toys/muffled_weh.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/muffled_weh.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Items/Toys/muffled_weh.ogg - - type: Extractable - juiceSolution: - reagents: - - ReagentId: JuiceThatMakesYouWeh - Quantity: 30 - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Fiber - Quantity: 10 - - ReagentId: JuiceThatMakesYouWeh - Quantity: 10 - - type: Clothing - slots: - - HEAD - quickEquip: false - clothingVisuals: - head: - - state: spacelizard-equipped-HELMET - offset: "0, 0.03" - - type: FoodSequenceElement - entries: - CottonBurger: SpaceLizardPlushie - -- type: entity - parent: PlushieLizard - id: PlushieLizardInversed #Hew! - name: drazil plushie - description: An adorable stuffed toy that resembles a lizardperson from an inversed dimension. Hew! - components: - - type: Sprite - state: plushie_lizard_inversed - - type: Item - heldPrefix: plushielizardinversed - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/hew.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/hew.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/hew.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/hew.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/hew.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Items/Toys/hew.ogg - - type: Extractable - juiceSolution: - reagents: - - ReagentId: JuiceThatMakesYouHew - Quantity: 30 - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Fiber - Quantity: 10 - - ReagentId: JuiceThatMakesYouHew - Quantity: 10 - - type: Clothing - quickEquip: false - sprite: Objects/Fun/toys.rsi - equippedPrefix: lizard-inversed - slots: - - HEAD - - type: FoodSequenceElement - entries: - CottonBurger: InversedLizardPlushie - - -- type: entity - parent: BasePlushie - id: PlushieDiona - name: diona plushie - description: An adorable stuffed toy that resembles a diona. Love water and cuddles. Do not wet! - components: - - type: Sprite - layers: - - state: plushie_diona - - state: plushie_diona1 - map: [ "enum.SolutionContainerLayers.Fill" ] - visible: false - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/toy_rustle.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/toy_rustle.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/toy_rustle.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/toy_rustle.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Items/Toys/toy_rustle.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Items/Toys/toy_rustle.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/toy_rustle.ogg - - type: SolutionContainerManager - solutions: - plushie: - maxVol: 1 - food: - maxVol: 10 - reagents: - - ReagentId: Fiber - Quantity: 10 - - - type: RefillableSolution - solution: plushie - - type: SolutionContainerVisuals - solutionName: plushie - maxFillLevels: 1 - fillBaseName: plushie_diona - changeColor: false - - type: Appearance - - type: Reactive - reactions: - - reagents: [ Water ] - methods: [ Touch ] - effects: - - !type:AddToSolutionReaction - solution: plushie - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.3,0.3,0.3" - density: 15 - mask: - - ItemMask - rehydrate: - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.3,0.3,0.3" - hard: false - layer: - - LowImpassable - - type: CollisionWake - enabled: false - - type: FoodSequenceElement - entries: - CottonBurger: DionaPlushie - -- 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: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/rawr.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/rawr.ogg - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/rawr.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/rawr.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Items/Toys/rawr.ogg - - type: MeleeWeapon - wideAnimationRotation: 90 - soundHit: - path: /Audio/Items/Toys/rawr.ogg - animation: WeaponArcBite - - type: Item - heldPrefix: blue - storedRotation: -90 - - type: Tag - tags: - - PlushieSharkBlue - - Payload - - type: FoodSequenceElement - entries: - CottonBurger: BlueSharkPlushie - -- 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: Tag - tags: - - PlushieSharkPink - - Payload - - type: FoodSequenceElement - entries: - CottonBurger: PinkSharkPlushie - -- 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: Tag - tags: - - PlushieSharkGrey - - Payload - - type: FoodSequenceElement - entries: - CottonBurger: GreySharkPlushie - -- type: entity - parent: BasePlushie - id: PlushieRatvar - name: ratvar plushie - description: A small stuffed doll of the elder god Ratvar. - components: - - type: Item - size: Normal - - type: Sprite - state: plushie_ratvar - - type: FoodSequenceElement - entries: - CottonBurger: RatvarPlushie - -- type: entity - parent: BasePlushie - id: PlushieNar - name: nar'sie plushie - description: A small stuffed doll of the elder goddess Nar'Sie. - components: - - type: Item - size: Normal - - type: Sprite - state: narplush - - type: FoodSequenceElement - entries: - CottonBurger: NarPlushie - -- type: entity - parent: BasePlushie - id: PlushieCarp - name: carp plushie - description: An adorable stuffed toy that resembles the monstrous space carp. - components: - - type: Sprite - state: carpplush - - type: Item - heldPrefix: carpplush - storedRotation: -90 - - type: EmitSoundOnUse - sound: - path: /Audio/Effects/bite.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Effects/bite.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Effects/bite.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Effects/bite.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Effects/bite.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Effects/bite.ogg - - type: MeleeWeapon - wideAnimationRotation: 90 - soundHit: - path: /Audio/Effects/bite.ogg - angle: 0 - animation: WeaponArcBite # Rrrr! - - type: Tag - tags: - - Payload - - ClothMade - - PlushieCarp - - type: FoodSequenceElement - entries: - CottonBurger: CarpPlushie - -- type: entity - parent: PlushieCarp - id: PlushieMagicarp - name: magicarp plushie - description: An adorable stuffed toy resembling the exceedingly rare magicarp. - components: - - type: Sprite - state: magicplush - - type: FoodSequenceElement - entries: - CottonBurger: MagicarpPlushie - -- type: entity - parent: PlushieCarp - id: PlushieRainbowCarp - name: rainbow carp plushie - description: An adorable stuffed toy resembling the legendary rainbow carp. - components: - - type: Sprite - state: rainbowcarpplush - - type: PointLight - radius: 1.5 - energy: 2 - - type: RgbLightController - layers: [ 0 ] - - type: Item - inhandVisuals: - left: - - state: rainbowcarpplush-inhand-left - shader: unshaded - right: - - state: rainbowcarpplush-inhand-right - shader: unshaded - -- type: entity - parent: PlushieCarp - id: PlushieHolocarp - name: holocarp plushie - description: A holographic stuffed toy resembling science's nemesis - the holocarp. - components: - - type: Sprite - state: holoplush - - type: FoodSequenceElement - entries: - CottonBurger: HolocarpPlushie - -- type: entity - parent: BasePlushie - id: PlushieSlime - name: slime plushie - description: An adorable stuffed toy that resembles a slime. It's basically a hacky sack. - components: - - type: Sprite - state: plushie_slime - - type: EmitSoundOnUse - sound: - path: /Audio/Voice/Slime/slime_squish.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Voice/Slime/slime_squish.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Voice/Slime/slime_squish.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Voice/Slime/slime_squish.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Voice/Slime/slime_squish.ogg - - type: FoodSequenceElement - entries: - CottonBurger: SlimePlushie - -- type: entity - parent: BasePlushie - id: PlushieSnake - name: snake plushie - description: An adorable stuffed toy that resembles a snake. - components: - - type: Sprite - state: plushie_snake - - type: Item - heldPrefix: plushiesnake - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/rattle.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/rattle.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/rattle.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/rattle.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Items/Toys/rattle.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/rattle.ogg - - type: MeleeWeapon - wideAnimationRotation: 90 - soundHit: - path: /Audio/Items/Toys/rattle.ogg - - type: Clothing - quickEquip: false - equippedPrefix: plushiesnake - slots: - - NECK - - type: Speech - speechVerb: Reptilian # for pais (In the secret stash) - - type: FoodSequenceElement - entries: - CottonBurger: SnakePlushie - -- type: entity - parent: BasePlushie - id: ToyMouse - name: mouse toy - description: A colorful toy mouse! - components: - - type: Sprite - state: toy_mouse - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/mousesqueek.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/mousesqueek.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/mousesqueek.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/mousesqueek.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Items/Toys/mousesqueek.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/mousesqueek.ogg - - type: MeleeWeapon - wideAnimationRotation: -90 - soundHit: - path: /Audio/Items/Toys/mousesqueek.ogg - - type: Clothing - quickEquip: false - sprite: Objects/Fun/toys.rsi - equippedPrefix: mouse - slots: - - HEAD - - type: FoodSequenceElement - entries: - CottonBurger: MousePlushie - -- type: entity - parent: BasePlushie - id: PlushieVox - name: vox plushie - description: SKREEEEEEEEEEEE! - components: - - type: Sprite - state: plushie_vox - - type: EmitSoundOnUse - sound: - path: /Audio/Voice/Vox/shriek1.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Voice/Vox/shriek1.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Voice/Vox/shriek1.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Voice/Vox/shriek1.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Voice/Vox/shriek1.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Voice/Vox/shriek1.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Voice/Vox/shriek1.ogg - - type: FoodSequenceElement - entries: - CottonBurger: VoxPlushie - -- type: entity - parent: BasePlushie - id: PlushieAtmosian - name: atmosian plushie - description: An adorable stuffed toy that resembles a brave atmosian. Unfortunately, he won't fix those depressurizations for you. - components: - - type: Sprite - state: plushie_atmosian - - type: FoodSequenceElement - entries: - CottonBurger: AtmosianPlushie - -- type: entity - parent: BasePlushie - id: PlushieXeno - 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 - sound: - path: /Audio/Weapons/Xeno/alien_spitacid.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Weapons/Xeno/alien_spitacid.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Weapons/Xeno/alien_spitacid.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Weapons/Xeno/alien_spitacid.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Weapons/Xeno/alien_spitacid.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/mousesqueek.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Weapons/Xeno/alien_spitacid.ogg - - type: FoodSequenceElement - entries: - CottonBurger: XenoPlushie - -- type: entity - parent: BasePlushie - id: PlushiePenguin - name: penguin plushie - description: I use arch btw! - components: - - type: Sprite - state: plushie_penguin - - type: FoodSequenceElement - entries: - CottonBurger: PenguinPlushie - -- type: entity - parent: BasePlushie - id: PlushieHuman - name: human plushie - description: This is a felt plush of a human. All craftsmanship is of the lowest quality. The human is naked. The human is crying. The human is screaming. - components: - - type: Sprite - state: plushie_human - - type: EmitSoundOnUse - sound: - path: /Audio/Voice/Human/malescream_1.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Voice/Human/malescream_2.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Voice/Human/malescream_3.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Voice/Human/malescream_4.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Voice/Human/malescream_1.ogg - - type: MeleeWeapon - soundHit: - path: /Audio/Voice/Human/malescream_4.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Voice/Human/malescream_5.ogg - - type: FoodSequenceElement - entries: - CottonBurger: HumanPlushie - -- type: entity - parent: BasePlushie - id: PlushieMoth - name: moth plushie - description: Cute and fluffy moth plushie. Enjoy, bz! - components: - - type: Sprite - state: plushie_moth - - type: EmitSoundOnUse - sound: - path: /Audio/Voice/Moth/moth_chitter.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Voice/Moth/moth_chitter.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Voice/Moth/moth_chitter.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Voice/Moth/moth_chitter.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Voice/Moth/moth_chitter.ogg - - type: MeleeWeapon - soundHit: - path: /Audio/Voice/Moth/moth_chitter.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Voice/Moth/moth_chitter.ogg - - type: FoodSequenceElement - entries: - CottonBurger: MothPlushie - ## Rubber - type: entity @@ -1174,11 +30,9 @@ id: BaseRubberToy abstract: true components: - - type: Sprite - sprite: Objects/Fun/toys.rsi - type: Tag tags: - - Payload + - Payload - type: UseDelay delay: 1.0 - type: MeleeWeapon @@ -1204,8 +58,6 @@ name: rubber ducky description: Not carried here by ocean currents. components: - - type: Item - size: Tiny - type: Sprite sprite: Objects/Fun/ducky.rsi state: icon @@ -1214,6 +66,8 @@ sprite: Objects/Fun/ducky.rsi slots: - HEAD + - type: Item + size: Tiny - type: EmitSoundOnUse sound: path: /Audio/Items/Toys/quack.ogg @@ -1240,7 +94,8 @@ description: A stress inducing parody of nature's most delectable avian. components: - type: Sprite - state: rubber_chicken + sprite: Objects/Fun/rubber_chicken.rsi + state: icon - type: EmitSoundOnUse sound: collection: RubberChicken @@ -1282,8 +137,6 @@ description: A small miniature. abstract: true components: - - type: Sprite - sprite: Objects/Fun/toys.rsi - type: PhysicalComposition materialComposition: Plastic: 100 @@ -1300,7 +153,8 @@ description: A scaled-down toy AI core. components: - type: Sprite - state: AI + sprite: Objects/Fun/AI.rsi + state: icon - type: entity parent: BaseFigurineCheapo @@ -1309,10 +163,11 @@ description: A plastic model of a Nuclear Fission Explosive. No uranium included... probably. components: - type: Sprite - state: nuketoy + sprite: Objects/Fun/toy_nuke.rsi + state: icon - type: Tag tags: - - Payload + - Payload - type: UseDelay delay: 180.0 - type: EmitSoundOnUse @@ -1340,10 +195,11 @@ name: ian toy description: Unable to eat, but just as fluffy as the real guy! components: + - type: Sprite + sprite: Objects/Fun/toy_ian.rsi + state: icon - type: Item size: Tiny - - type: Sprite - state: ian - type: EmitSoundOnUse sound: path: /Audio/Items/Toys/ian.ogg @@ -1389,23 +245,22 @@ description: Aiming this at Security may get you filled with lead. components: - type: Sprite - sprite: Objects/Fun/toys.rsi - state: foamcrossbow + sprite: Objects/Fun/Foam/foam_crossbow.rsi + state: icon - type: Item size: Normal - sprite: Objects/Fun/toys.rsi - heldPrefix: foamcrossbow + sprite: Objects/Fun/Foam/foam_crossbow.rsi - type: Gun fireRate: 0.5 selectedMode: SemiAuto availableModes: - - SemiAuto + - SemiAuto soundGunshot: path: /Audio/Weapons/click.ogg - type: BallisticAmmoProvider whitelist: tags: - - BulletFoam + - BulletFoam capacity: 1 soundInsert: path: /Audio/Items/bow_pull.ogg @@ -1430,13 +285,12 @@ description: Looks almost like the real thing! Ages 8 and up. components: - type: Sprite - sprite: Objects/Fun/toys.rsi + sprite: Objects/Fun/capgun.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - type: Item - sprite: Objects/Fun/toys.rsi - heldPrefix: capgun + sprite: Objects/Fun/capgun.rsi - type: Tag tags: - Sidearm @@ -1444,7 +298,7 @@ - type: Gun selectedMode: SemiAuto availableModes: - - SemiAuto + - SemiAuto fireRate: 2 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/revolver.ogg @@ -1454,8 +308,8 @@ - type: RevolverAmmoProvider whitelist: tags: - - CartridgeCap - - SpeedLoaderCap + - CartridgeCap + - SpeedLoaderCap proto: CartridgeCap capacity: 6 chambers: [ True, True, True, True, True, True ] @@ -1476,10 +330,10 @@ - type: RevolverAmmoProvider whitelist: tags: - - CartridgeCap - - SpeedLoaderCap - - CartridgeMagnum - - SpeedLoaderMagnum + - CartridgeCap + - SpeedLoaderCap + - CartridgeMagnum + - SpeedLoaderMagnum proto: CartridgeMagnumAP - type: entity @@ -1489,8 +343,8 @@ description: It says "Sternside Changs number 1 fan" on it. components: - type: Sprite - sprite: Objects/Fun/toys.rsi - state: foamblade + sprite: Objects/Fun/Foam/foam_blade.rsi + state: icon - type: MeleeWeapon attackRate: 1.5 angle: 0 @@ -1501,8 +355,7 @@ Blunt: 0 - type: Item size: Small - sprite: Objects/Fun/toys.rsi - heldPrefix: foamblade + sprite: Objects/Fun/Foam/foam_blade.rsi - type: UseDelay # MISC @@ -1514,15 +367,14 @@ description: Where dah courts at? components: - type: Sprite - sprite: Objects/Fun/toys.rsi - state: basketball + sprite: Objects/Fun/Balls/basketball.rsi + state: icon - type: EmitSoundOnCollide sound: path: /Audio/Effects/Footsteps/bounce.ogg - type: Item size: Normal - sprite: Objects/Fun/toys.rsi - heldPrefix: bask + sprite: Objects/Fun/Balls/basketball.rsi - type: TileFrictionModifier modifier: 0.5 @@ -1533,12 +385,11 @@ description: Otherwise known as a handegg. components: - type: Sprite - sprite: Objects/Fun/toys.rsi - state: football + sprite: Objects/Fun/Balls/football.rsi + state: icon - type: Item size: Small - sprite: Objects/Fun/toys.rsi - heldPrefix: footb + sprite: Objects/Fun/Balls/football.rsi - type: entity parent: BaseItem @@ -1547,15 +398,14 @@ description: The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen components: - type: Sprite - sprite: Objects/Fun/toys.rsi - state: beachball + sprite: Objects/Fun/Balls/beach_ball.rsi + state: icon - type: EmitSoundOnCollide sound: path: /Audio/Effects/Footsteps/bounce.ogg - type: Item size: Normal - sprite: Objects/Fun/toys.rsi - heldPrefix: beachb + sprite: Objects/Fun/Balls/beach_ball.rsi - type: TileFrictionModifier modifier: 0.05 @@ -1566,12 +416,11 @@ description: Handed out to the bravest souls who survived the "atomic twister" ride at Syndieland. components: - type: Sprite - sprite: Objects/Fun/toys.rsi - state: synb + sprite: Objects/Fun/Balloons/syndicate.rsi + state: icon - type: Item size: Small - sprite: Objects/Fun/toys.rsi - heldPrefix: synb + sprite: Objects/Fun/Balloons/syndicate.rsi - type: Damageable damageContainer: Inorganic - type: Tag @@ -1587,12 +436,11 @@ description: Specially designed to inflict maximum psychological damage to Syndicate operatives. components: - type: Sprite - sprite: Objects/Fun/toys.rsi - state: ntb + sprite: Objects/Fun/Balloons/nanotrasen.rsi + state: icon - type: Item size: Small - sprite: Objects/Fun/toys.rsi - heldPrefix: ntb + sprite: Objects/Fun/Balloons/nanotrasen.rsi - type: Damageable damageContainer: Inorganic - type: Tag @@ -1606,12 +454,11 @@ description: Just like owning a real dog - but a lot floatier. components: - type: Sprite - sprite: Objects/Fun/toys.rsi - state: corgib + sprite: Objects/Fun/Balloons/corgi.rsi + state: icon - type: Item size: Small - sprite: Objects/Fun/toys.rsi - heldPrefix: corgib + sprite: Objects/Fun/Balloons/corgi.rsi - type: Damageable damageContainer: Inorganic - type: Tag @@ -1625,18 +472,17 @@ description: Mass-produced by a sadistic corporate conglomerate! components: - type: Sprite - sprite: Objects/Fun/toys.rsi - state: singularitytoy + sprite: Objects/Fun/toy_singularity.rsi + state: icon - type: Icon - sprite: Objects/Fun/toys.rsi - state: singularitytoy + sprite: Objects/Fun/toy_singularity.rsi + state: icon - type: SingularityDistortion intensity: 2000 falloffPower: 2.6 - type: Item size: Normal - sprite: Objects/Fun/toys.rsi - heldPrefix: singularitytoy + sprite: Objects/Fun/icon.rsi - type: entity parent: BaseItem @@ -1671,16 +517,15 @@ description: Ponderous, man... Really ponderous. components: - type: Sprite - sprite: Objects/Fun/toys.rsi - state: orb + sprite: Objects/Fun/pondering_orb.rsi + state: icon shader: unshaded - type: PointLight radius: 2 color: "#00CCFF" - type: Item size: Normal - sprite: Objects/Fun/toys.rsi - heldPrefix: orb + sprite: Objects/Fun/pondering_orb.rsi - type: TileFrictionModifier modifier: 0.001 @@ -1712,68 +557,68 @@ name: toy sword description: New Sandy-Cat plastic sword! Comes with realistic sound and full color! Looks almost like the real thing! components: - - type: EnergySword - - type: ItemToggle - soundActivate: - path: /Audio/Weapons/ebladeon.ogg - soundDeactivate: - path: /Audio/Weapons/ebladeoff.ogg - - type: ItemToggleActiveSound - activeSound: - path: /Audio/Weapons/ebladehum.ogg - - type: Sprite - sprite: Objects/Weapons/Melee/e_sword.rsi - layers: - - state: e_sword - - state: e_sword_blade - color: "#FFFFFF" - visible: false - shader: unshaded - map: [ "blade" ] - - type: Item - size: Small - sprite: Objects/Weapons/Melee/e_sword-inhands.rsi - - type: UseDelay - delay: 1.0 - - type: PointLight - enabled: false - radius: 2 - energy: 2 - color: white - netsync: false - - type: Appearance - - type: ToggleableVisuals - spriteLayer: blade - inhandVisuals: - left: - - state: inhand-left-blade - shader: unshaded - right: - - state: inhand-right-blade - shader: unshaded - - type: ItemTogglePointLight - - type: DisarmMalus - malus: 0 - - type: StaminaDamageOnHit - damage: 8 - - type: MeleeWeapon - wideAnimationRotation: -135 - damage: - types: - Blunt: 0 - - type: ItemToggleMeleeWeapon - activatedSoundOnHit: - path: /Audio/Weapons/eblade1.ogg - params: - variation: 0.250 - activatedSoundOnHitNoDamage: - path: /Audio/Weapons/eblade1.ogg - params: - variation: 0.250 - activatedSoundOnSwing: - path: /Audio/Weapons/eblademiss.ogg - params: - variation: 0.125 + - type: Sprite + sprite: Objects/Weapons/Melee/e_sword.rsi + layers: + - state: e_sword + - state: e_sword_blade + color: "#FFFFFF" + visible: false + shader: unshaded + map: [ "blade" ] + - type: EnergySword + - type: ItemToggle + soundActivate: + path: /Audio/Weapons/ebladeon.ogg + soundDeactivate: + path: /Audio/Weapons/ebladeoff.ogg + - type: ItemToggleActiveSound + activeSound: + path: /Audio/Weapons/ebladehum.ogg + - type: Item + size: Small + sprite: Objects/Weapons/Melee/e_sword-inhands.rsi + - type: UseDelay + delay: 1.0 + - type: PointLight + enabled: false + radius: 2 + energy: 2 + color: white + netsync: false + - type: Appearance + - type: ToggleableLightVisuals + spriteLayer: blade + inhandVisuals: + left: + - state: inhand-left-blade + shader: unshaded + right: + - state: inhand-right-blade + shader: unshaded + - type: ItemTogglePointLight + - type: DisarmMalus + malus: 0 + - type: StaminaDamageOnHit + damage: 8 + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Blunt: 0 + - type: ItemToggleMeleeWeapon + activatedSoundOnHit: + path: /Audio/Weapons/eblade1.ogg + params: + variation: 0.250 + activatedSoundOnHitNoDamage: + path: /Audio/Weapons/eblade1.ogg + params: + variation: 0.250 + activatedSoundOnSwing: + path: /Audio/Weapons/eblademiss.ogg + params: + variation: 0.125 - type: entity parent: BasePlushie @@ -1789,8 +634,8 @@ - state: visor - type: RandomSprite available: - - enum.DamageStateVisualLayers.Base: - base: Sixteen + - enum.DamageStateVisualLayers.Base: + base: Sixteen # - type: FoodSequenceElement - does not work with randomized sprites # entries: # CottonBurger: AmongPequeno @@ -1857,36 +702,36 @@ name: rubber hammer description: A brightly colored hammer made of rubber. components: - - type: Sprite - sprite: Objects/Fun/rubber_hammer.rsi - state: icon - - type: WeaponRandom - damageBonus: - types: - Blunt: 1000 - - type: StaminaDamageOnHit - damage: 8 - - type: Item - size: Small - sprite: Objects/Fun/rubber_hammer.rsi - - type: Appearance - - type: DisarmMalus - malus: 0 - - type: MeleeWeapon - wideAnimationRotation: -135 - soundHit: - collection: RubberHammer - params: - variation: 0.03 - volume: 3 - soundNoDamage: - collection: RubberHammer - params: - variation: 0.03 - volume: 3 - damage: - types: - Blunt: 0 + - type: Sprite + sprite: Objects/Fun/rubber_hammer.rsi + state: icon + - type: WeaponRandom + damageBonus: + types: + Blunt: 1000 + - type: StaminaDamageOnHit + damage: 8 + - type: Item + size: Small + sprite: Objects/Fun/rubber_hammer.rsi + - type: Appearance + - type: DisarmMalus + malus: 0 + - type: MeleeWeapon + wideAnimationRotation: -135 + soundHit: + collection: RubberHammer + params: + variation: 0.03 + volume: 3 + soundNoDamage: + collection: RubberHammer + params: + variation: 0.03 + volume: 3 + damage: + types: + Blunt: 0 - type: entity parent: BaseItem @@ -1900,7 +745,7 @@ quickEquip: false - type: Tag tags: - - Payload + - Payload - type: EmitSoundOnUse sound: collection: Parp @@ -1972,12 +817,12 @@ description: A plastic banana. suffix: Plastic components: - - type: FlavorProfile - flavors: - - plastic - - type: Food - type: Sprite sprite: Objects/Specific/Hydroponics/banana.rsi + - type: FlavorProfile + flavors: + - plastic + - type: Food - type: SolutionContainerManager solutions: food: @@ -1994,15 +839,12 @@ name: crazy glue description: A bottle of crazy glue manufactured by Honk! Co. components: - - type: Openable - sound: - collection: packetOpenSounds - type: Sprite sprite: Objects/Fun/glue.rsi state: icon layers: - - state: icon - map: ["enum.OpenableVisuals.Layer"] + - state: icon + map: ["enum.OpenableVisuals.Layer"] - type: Appearance - type: GenericVisualizer visuals: @@ -2021,11 +863,14 @@ reagents: - ReagentId: SpaceGlue Quantity: 100 + - type: Openable + sound: + collection: packetOpenSounds - type: TrashOnSolutionEmpty solution: drink - type: Tag tags: - - DrinkSpaceGlue + - DrinkSpaceGlue - type: entity parent: BaseItem diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml index 14595bd34a..cfe080da6d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml @@ -24,7 +24,7 @@ - Trash - type: Ammo - type: Sprite - sprite: Objects/Fun/toys.rsi + sprite: Objects/Fun/Foam/foam_crossbow.rsi layers: - state: foamdart - type: EmbeddableProjectile diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index e233b7f2a1..712be28de3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -910,7 +910,7 @@ categories: [ HideSpawnMenu ] components: - type: Sprite - sprite: Objects/Fun/toys.rsi + sprite: Objects/Fun/capgun.rsi layers: - state: capbullet - type: Projectile diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 1945e4868d..c3262107de 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -198,11 +198,11 @@ description: A premium foam rifle of the highest quality. Its plastic feels rugged, and its mechanisms sturdy. components: - type: Sprite - sprite: Objects/Weapons/Guns/Rifles/foam_rifle.rsi + sprite: Objects/Fun/Foam/foam_rifle.rsi - type: Clothing - sprite: Objects/Weapons/Guns/Rifles/foam_rifle.rsi + sprite: Objects/Fun/Foam/foam_rifle.rsi - type: Item - sprite: Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi + sprite: Objects/Fun/Foam/foam_rifle_inhand_64x.rsi - type: BallisticAmmoProvider whitelist: tags: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml index 8e3cb12717..0fbc9e1694 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml @@ -157,7 +157,7 @@ description: Releases a bothersome spray of foam darts that cause severe welching. components: - type: Sprite - sprite: Objects/Weapons/Grenades/foamdart.rsi + sprite: Objects/Fun/Foam/foam_grenade.rsi layers: - state: icon map: ["Base"] diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/lizard_slippers.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/lizard_slippers.yml index 0cca4e0dcb..149e2fa9c0 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/lizard_slippers.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/lizard_slippers.yml @@ -9,14 +9,14 @@ - tag: PlushieLizard #Weh! name: construction-graph-tag-lizard-plushie icon: - sprite: Objects/Fun/toys.rsi - state: plushie_lizard + sprite: Objects/Fun/Plushies/lizard.rsi + state: icon doAfter: 1 - tag: PlushieLizard name: construction-graph-tag-lizard-plushie icon: - sprite: Objects/Fun/toys.rsi - state: plushie_lizard + sprite: Objects/Fun/Plushies/lizard.rsi + state: icon doAfter: 1 - node: shoes entity: ClothingShoeSlippersLizard diff --git a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml index 2b89ab1b41..343df2b7d6 100644 --- a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml +++ b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml @@ -1299,8 +1299,8 @@ name: food-sequence-cotton-burger-content-plushie-bee scale: 0.75, 0.75 sprites: - - sprite: Objects/Fun/toys.rsi - state: plushie_h + - sprite: Objects/Fun/Plushies/bee.rsi + state: icon # Hamptr Plushie @@ -1308,8 +1308,8 @@ id: HamptrPlushie name: food-sequence-cotton-burger-content-plushie-hamptr sprites: - - sprite: Objects/Fun/toys.rsi - state: plushie_hampter + - sprite: Objects/Fun/Plushies/hampter.rsi + state: icon # Nukie Plushie @@ -1318,8 +1318,8 @@ scale: 0.8, 0.8 name: food-sequence-cotton-burger-content-plushie-nukie sprites: - - sprite: Objects/Fun/toys.rsi - state: plushie_nuke + - sprite: Objects/Fun/Plushies/nukie.rsi + state: icon # Rouny Plushie @@ -1327,8 +1327,8 @@ id: RounyPlushie name: food-sequence-cotton-burger-content-plushie-rouny sprites: - - sprite: Objects/Fun/toys.rsi - state: plushie_rouny + - sprite: Objects/Fun/Plushies/rouny.rsi + state: icon # Lamp Plushie @@ -1336,8 +1336,8 @@ id: LampPlushie name: food-sequence-cotton-burger-content-plushie-lamp sprites: - - sprite: Objects/Fun/toys.rsi - state: plushie_lamp + - sprite: Objects/Fun/Plushies/lamp.rsi + state: icon # Arachnid Plushie @@ -1346,8 +1346,8 @@ scale: 0.8, 0.8 name: food-sequence-cotton-burger-content-plushie-arachnid sprites: - - sprite: Objects/Fun/toys.rsi - state: plushie_arachnid + - sprite: Objects/Fun/Plushies/arachnid.rsi + state: icon # Lizard Plushies @@ -1355,21 +1355,21 @@ id: LizardPlushie name: food-sequence-cotton-burger-content-plushie-lizard #Weh! sprites: - - sprite: Objects/Fun/toys.rsi - state: plushie_lizard + - sprite: Objects/Fun/Plushies/lizard.rsi + state: icon - type: foodSequenceElement id: SpaceLizardPlushie name: food-sequence-cotton-burger-content-plushie-spacelizard sprites: - - sprite: Objects/Fun/toys.rsi + - sprite: Objects/Fun/Plushies/lizard.rsi state: plushie_spacelizard - type: foodSequenceElement id: InversedLizardPlushie name: food-sequence-cotton-burger-content-plushie-lizard-inversed #Hew! sprites: - - sprite: Objects/Fun/toys.rsi + - sprite: Objects/Fun/Plushies/lizard.rsi state: plushie_lizard_inversed # Experiment Plushie @@ -1379,8 +1379,8 @@ scale: 0.8, 0.8 name: food-sequence-cotton-burger-content-plushie-experiment sprites: - - sprite: Objects/Fun/expiplush.rsi - state: expi + - sprite: Objects/Fun/Plushies/expi.rsi + state: icon #Diona Plushie @@ -1389,7 +1389,7 @@ scale: 0.8, 0.8 name: food-sequence-cotton-burger-content-plushie-diona sprites: - - sprite: Objects/Fun/toys.rsi + - sprite: Objects/Fun/Plushies/diona.rsi state: plushie_diona #Shark Plushies @@ -1399,7 +1399,7 @@ scale: 0.8, 0.8 name: food-sequence-cotton-burger-content-plushie-shark sprites: - - sprite: Objects/Fun/sharkplush.rsi + - sprite: Objects/Fun/Plushies/shark.rsi state: blue - type: foodSequenceElement @@ -1407,7 +1407,7 @@ scale: 0.8, 0.8 name: food-sequence-cotton-burger-content-plushie-shark sprites: - - sprite: Objects/Fun/sharkplush.rsi + - sprite: Objects/Fun/Plushies/shark.rsi state: pink - type: foodSequenceElement @@ -1415,7 +1415,7 @@ scale: 0.8, 0.8 name: food-sequence-cotton-burger-content-plushie-shark sprites: - - sprite: Objects/Fun/sharkplush.rsi + - sprite: Objects/Fun/Plushies/shark.rsi state: grey #Ratvar Plushie @@ -1425,8 +1425,8 @@ scale: 0.8, 0.8 name: food-sequence-cotton-burger-content-plushie-ratvar sprites: - - sprite: Objects/Fun/toys.rsi - state: plushie_ratvar + - sprite: Objects/Fun/Plushies/ratvar.rsi + state: icon #Nar'sie Plushie @@ -1435,8 +1435,8 @@ scale: 0.75, 0.75 name: food-sequence-cotton-burger-content-plushie-narsie sprites: - - sprite: Objects/Fun/toys.rsi - state: narplush + - sprite: Objects/Fun/Plushies/narsie.rsi + state: icon #Carp Plushies @@ -1444,21 +1444,21 @@ id: CarpPlushie name: food-sequence-cotton-burger-content-plushie-carp sprites: - - sprite: Objects/Fun/toys.rsi + - sprite: Objects/Fun/Plushies/carp.rsi state: carpplush - type: foodSequenceElement id: MagicarpPlushie name: food-sequence-cotton-burger-content-plushie-magicarp sprites: - - sprite: Objects/Fun/toys.rsi + - sprite: Objects/Fun/Plushies/carp.rsi state: magicplush - type: foodSequenceElement id: HolocarpPlushie name: food-sequence-cotton-burger-content-plushie-holocarp sprites: - - sprite: Objects/Fun/toys.rsi + - sprite: Objects/Fun/Plushies/carp.rsi state: holoplush #Slime Plushie @@ -1467,8 +1467,8 @@ id: SlimePlushie name: food-sequence-cotton-burger-content-plushie-slime sprites: - - sprite: Objects/Fun/toys.rsi - state: plushie_slime + - sprite: Objects/Fun/Plushies/slime.rsi + state: icon #Snake Plushie @@ -1476,17 +1476,17 @@ id: SnakePlushie name: food-sequence-cotton-burger-content-plushie-snake sprites: - - sprite: Objects/Fun/toys.rsi - state: plushie_snake + - sprite: Objects/Fun/Plushies/snake.rsi + state: icon -#Mouse Plushie +#Mouse Toy - type: foodSequenceElement id: MousePlushie name: food-sequence-cotton-burger-content-plushie-mouse sprites: - - sprite: Objects/Fun/toys.rsi - state: toy_mouse + - sprite: Objects/Fun/toy_mouse.rsi + state: icon #Vox Plushie @@ -1494,8 +1494,8 @@ id: VoxPlushie name: food-sequence-cotton-burger-content-plushie-vox sprites: - - sprite: Objects/Fun/toys.rsi - state: plushie_vox + - sprite: Objects/Fun/Plushies/vox.rsi + state: icon #Atmosian Plushie @@ -1504,8 +1504,8 @@ scale: 0.8, 0.8 name: food-sequence-cotton-burger-content-plushie-atmosian sprites: - - sprite: Objects/Fun/toys.rsi - state: plushie_atmosian + - sprite: Objects/Fun/Plushies/atmosian.rsi + state: icon #Xeno Plushie @@ -1514,8 +1514,8 @@ scale: 0.8, 0.8 name: food-sequence-cotton-burger-content-plushie-xeno sprites: - - sprite: Objects/Fun/toys.rsi - state: plushie_xeno + - sprite: Objects/Fun/Plushies/xeno.rsi + state: icon #Penguin Plushie @@ -1524,8 +1524,8 @@ scale: 0.8, 0.8 name: food-sequence-cotton-burger-content-plushie-penguin sprites: - - sprite: Objects/Fun/toys.rsi - state: plushie_penguin + - sprite: Objects/Fun/Plushies/penguin.rsi + state: icon #Human Plushie @@ -1534,8 +1534,8 @@ scale: 0.8, 0.8 name: food-sequence-cotton-burger-content-plushie-human sprites: - - sprite: Objects/Fun/toys.rsi - state: plushie_human + - sprite: Objects/Fun/Plushies/human.rsi + state: icon #Moth Plushie @@ -1544,17 +1544,17 @@ scale: 0.8, 0.8 name: food-sequence-cotton-burger-content-plushie-moth sprites: - - sprite: Objects/Fun/toys.rsi - state: plushie_moth + - sprite: Objects/Fun/Plushies/moth.rsi + state: icon -#Ian Plushie +#Ian Toy - type: foodSequenceElement id: IanPlushie name: food-sequence-cotton-burger-content-plushie-ian sprites: - - sprite: Objects/Fun/toys.rsi - state: ian + - sprite: Objects/Fun/toy_ian.rsi + state: icon #Among pequeño - does not work with randomized sprites diff --git a/Resources/Textures/Interface/Emotes/attributions.yml b/Resources/Textures/Interface/Emotes/attributions.yml index d29915984d..08152d6260 100644 --- a/Resources/Textures/Interface/Emotes/attributions.yml +++ b/Resources/Textures/Interface/Emotes/attributions.yml @@ -113,7 +113,7 @@ - files: ["weh.png"] license: "CC-BY-SA-3.0" - copyright: "Modified from plushie_lizard.png by TyAshley (AllenTheGreat) & Sarahon" + copyright: "Modified from plushie_lizard.png (icon.png in Plushies/lizard.rsi) by TyAshley (AllenTheGreat) & Sarahon" source: "https://github.com/TyAshley" - files: ["whistle.png"] diff --git a/Resources/Textures/Objects/Fun/toys.rsi/AI.png b/Resources/Textures/Objects/Fun/AI.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/AI.png rename to Resources/Textures/Objects/Fun/AI.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/AI.rsi/meta.json b/Resources/Textures/Objects/Fun/AI.rsi/meta.json new file mode 100644 index 0000000000..e5ddb0f4d7 --- /dev/null +++ b/Resources/Textures/Objects/Fun/AI.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/corgib.png b/Resources/Textures/Objects/Fun/Balloons/corgi.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/corgib.png rename to Resources/Textures/Objects/Fun/Balloons/corgi.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/corgib-inhand-left.png b/Resources/Textures/Objects/Fun/Balloons/corgi.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/corgib-inhand-left.png rename to Resources/Textures/Objects/Fun/Balloons/corgi.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/corgib-inhand-right.png b/Resources/Textures/Objects/Fun/Balloons/corgi.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/corgib-inhand-right.png rename to Resources/Textures/Objects/Fun/Balloons/corgi.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Fun/Balloons/corgi.rsi/meta.json b/Resources/Textures/Objects/Fun/Balloons/corgi.rsi/meta.json new file mode 100644 index 0000000000..382967c9cc --- /dev/null +++ b/Resources/Textures/Objects/Fun/Balloons/corgi.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/ntb.png b/Resources/Textures/Objects/Fun/Balloons/nanotrasen.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/ntb.png rename to Resources/Textures/Objects/Fun/Balloons/nanotrasen.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/ntb-inhand-left.png b/Resources/Textures/Objects/Fun/Balloons/nanotrasen.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/ntb-inhand-left.png rename to Resources/Textures/Objects/Fun/Balloons/nanotrasen.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/ntb-inhand-right.png b/Resources/Textures/Objects/Fun/Balloons/nanotrasen.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/ntb-inhand-right.png rename to Resources/Textures/Objects/Fun/Balloons/nanotrasen.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Fun/Balloons/nanotrasen.rsi/meta.json b/Resources/Textures/Objects/Fun/Balloons/nanotrasen.rsi/meta.json new file mode 100644 index 0000000000..cde7ec5ff6 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Balloons/nanotrasen.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Sprites by MACMAN2003", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/synb.png b/Resources/Textures/Objects/Fun/Balloons/syndicate.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/synb.png rename to Resources/Textures/Objects/Fun/Balloons/syndicate.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/synb-inhand-left.png b/Resources/Textures/Objects/Fun/Balloons/syndicate.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/synb-inhand-left.png rename to Resources/Textures/Objects/Fun/Balloons/syndicate.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/synb-inhand-right.png b/Resources/Textures/Objects/Fun/Balloons/syndicate.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/synb-inhand-right.png rename to Resources/Textures/Objects/Fun/Balloons/syndicate.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Fun/Balloons/syndicate.rsi/meta.json b/Resources/Textures/Objects/Fun/Balloons/syndicate.rsi/meta.json new file mode 100644 index 0000000000..382967c9cc --- /dev/null +++ b/Resources/Textures/Objects/Fun/Balloons/syndicate.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/basketball.png b/Resources/Textures/Objects/Fun/Balls/basketball.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/basketball.png rename to Resources/Textures/Objects/Fun/Balls/basketball.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/bask-inhand-left.png b/Resources/Textures/Objects/Fun/Balls/basketball.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/bask-inhand-left.png rename to Resources/Textures/Objects/Fun/Balls/basketball.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/bask-inhand-right.png b/Resources/Textures/Objects/Fun/Balls/basketball.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/bask-inhand-right.png rename to Resources/Textures/Objects/Fun/Balls/basketball.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Fun/Balls/basketball.rsi/meta.json b/Resources/Textures/Objects/Fun/Balls/basketball.rsi/meta.json new file mode 100644 index 0000000000..0bf1423440 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Balls/basketball.rsi/meta.json @@ -0,0 +1,82 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4, + "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, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "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, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/beachball.png b/Resources/Textures/Objects/Fun/Balls/beach_ball.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/beachball.png rename to Resources/Textures/Objects/Fun/Balls/beach_ball.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/beachb-inhand-left.png b/Resources/Textures/Objects/Fun/Balls/beach_ball.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/beachb-inhand-left.png rename to Resources/Textures/Objects/Fun/Balls/beach_ball.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/beachb-inhand-right.png b/Resources/Textures/Objects/Fun/Balls/beach_ball.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/beachb-inhand-right.png rename to Resources/Textures/Objects/Fun/Balls/beach_ball.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Fun/Balls/beach_ball.rsi/meta.json b/Resources/Textures/Objects/Fun/Balls/beach_ball.rsi/meta.json new file mode 100644 index 0000000000..2180de8bd6 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Balls/beach_ball.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Icon taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, inhands by ;3#1161", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/football.png b/Resources/Textures/Objects/Fun/Balls/football.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/football.png rename to Resources/Textures/Objects/Fun/Balls/football.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/footb-inhand-left.png b/Resources/Textures/Objects/Fun/Balls/football.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/footb-inhand-left.png rename to Resources/Textures/Objects/Fun/Balls/football.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/footb-inhand-right.png b/Resources/Textures/Objects/Fun/Balls/football.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/footb-inhand-right.png rename to Resources/Textures/Objects/Fun/Balls/football.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Fun/Balls/football.rsi/meta.json b/Resources/Textures/Objects/Fun/Balls/football.rsi/meta.json new file mode 100644 index 0000000000..382967c9cc --- /dev/null +++ b/Resources/Textures/Objects/Fun/Balls/football.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/foamblade.png b/Resources/Textures/Objects/Fun/Foam/foam_blade.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/foamblade.png rename to Resources/Textures/Objects/Fun/Foam/foam_blade.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/foamblade-inhand-left.png b/Resources/Textures/Objects/Fun/Foam/foam_blade.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/foamblade-inhand-left.png rename to Resources/Textures/Objects/Fun/Foam/foam_blade.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/foamblade-inhand-right.png b/Resources/Textures/Objects/Fun/Foam/foam_blade.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/foamblade-inhand-right.png rename to Resources/Textures/Objects/Fun/Foam/foam_blade.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Fun/Foam/foam_blade.rsi/meta.json b/Resources/Textures/Objects/Fun/Foam/foam_blade.rsi/meta.json new file mode 100644 index 0000000000..382967c9cc --- /dev/null +++ b/Resources/Textures/Objects/Fun/Foam/foam_blade.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/foambox.png b/Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/foambox.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/foambox.png rename to Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/foambox.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/foamdart.png b/Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/foamdart.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/foamdart.png rename to Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/foamdart.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/foamcrossbow.png b/Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/foamcrossbow.png rename to Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/foamcrossbow-inhand-left.png b/Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/foamcrossbow-inhand-left.png rename to Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/foamcrossbow-inhand-right.png b/Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/foamcrossbow-inhand-right.png rename to Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/meta.json b/Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/meta.json new file mode 100644 index 0000000000..b245d7e77d --- /dev/null +++ b/Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "foamdart" + }, + { + "name": "foambox" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/icon.png b/Resources/Textures/Objects/Fun/Foam/foam_grenade.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/icon.png rename to Resources/Textures/Objects/Fun/Foam/foam_grenade.rsi/icon.png diff --git a/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Foam/foam_grenade.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/inhand-left.png rename to Resources/Textures/Objects/Fun/Foam/foam_grenade.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Foam/foam_grenade.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/inhand-right.png rename to Resources/Textures/Objects/Fun/Foam/foam_grenade.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json b/Resources/Textures/Objects/Fun/Foam/foam_grenade.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json rename to Resources/Textures/Objects/Fun/Foam/foam_grenade.rsi/meta.json diff --git a/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/primed.png b/Resources/Textures/Objects/Fun/Foam/foam_grenade.rsi/primed.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/primed.png rename to Resources/Textures/Objects/Fun/Foam/foam_grenade.rsi/primed.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/bolt-open.png b/Resources/Textures/Objects/Fun/Foam/foam_rifle.rsi/bolt-open.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/bolt-open.png rename to Resources/Textures/Objects/Fun/Foam/foam_rifle.rsi/bolt-open.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Fun/Foam/foam_rifle.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/equipped-BACKPACK.png rename to Resources/Textures/Objects/Fun/Foam/foam_rifle.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Fun/Foam/foam_rifle.rsi/equipped-SUITSTORAGE.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/equipped-SUITSTORAGE.png rename to Resources/Textures/Objects/Fun/Foam/foam_rifle.rsi/equipped-SUITSTORAGE.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/icon.png b/Resources/Textures/Objects/Fun/Foam/foam_rifle.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/icon.png rename to Resources/Textures/Objects/Fun/Foam/foam_rifle.rsi/icon.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/meta.json b/Resources/Textures/Objects/Fun/Foam/foam_rifle.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/meta.json rename to Resources/Textures/Objects/Fun/Foam/foam_rifle.rsi/meta.json diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Foam/foam_rifle_inhand_64x.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/inhand-left.png rename to Resources/Textures/Objects/Fun/Foam/foam_rifle_inhand_64x.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Foam/foam_rifle_inhand_64x.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/inhand-right.png rename to Resources/Textures/Objects/Fun/Foam/foam_rifle_inhand_64x.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/meta.json b/Resources/Textures/Objects/Fun/Foam/foam_rifle_inhand_64x.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/meta.json rename to Resources/Textures/Objects/Fun/Foam/foam_rifle_inhand_64x.rsi/meta.json diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Fun/Foam/foam_rifle_inhand_64x.rsi/wielded-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/wielded-inhand-left.png rename to Resources/Textures/Objects/Fun/Foam/foam_rifle_inhand_64x.rsi/wielded-inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Fun/Foam/foam_rifle_inhand_64x.rsi/wielded-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/wielded-inhand-right.png rename to Resources/Textures/Objects/Fun/Foam/foam_rifle_inhand_64x.rsi/wielded-inhand-right.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_arachnid.png b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_arachnid.png rename to Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/meta.json new file mode 100644 index 0000000000..c26c4da7ce --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Sprite by PixelTheKermit (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_atmosian.png b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_atmosian.png rename to Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/meta.json new file mode 100644 index 0000000000..e5ddb0f4d7 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/bee-equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/bee.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/bee-equipped-HELMET.png rename to Resources/Textures/Objects/Fun/Plushies/bee.rsi/equipped-HELMET.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_h.png b/Resources/Textures/Objects/Fun/Plushies/bee.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_h.png rename to Resources/Textures/Objects/Fun/Plushies/bee.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/bee-inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/bee.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/bee-inhand-left.png rename to Resources/Textures/Objects/Fun/Plushies/bee.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/bee-inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/bee.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/bee-inhand-right.png rename to Resources/Textures/Objects/Fun/Plushies/bee.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Fun/Plushies/bee.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/bee.rsi/meta.json new file mode 100644 index 0000000000..f3e9558b50 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/bee.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, equipped-HELMET and in-hand sprites drawn by Ubaser", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/carpplush-inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/carpplush-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/carpplush-inhand-left.png rename to Resources/Textures/Objects/Fun/Plushies/carp.rsi/carpplush-inhand-left.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/carpplush-inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/carpplush-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/carpplush-inhand-right.png rename to Resources/Textures/Objects/Fun/Plushies/carp.rsi/carpplush-inhand-right.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/carpplush.png b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/carpplush.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/carpplush.png rename to Resources/Textures/Objects/Fun/Plushies/carp.rsi/carpplush.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/holoplush.png b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/holoplush.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/holoplush.png rename to Resources/Textures/Objects/Fun/Plushies/carp.rsi/holoplush.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/magicplush.png b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicplush.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/magicplush.png rename to Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicplush.png diff --git a/Resources/Textures/Objects/Fun/Plushies/carp.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/meta.json new file mode 100644 index 0000000000..8b92838d06 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/meta.json @@ -0,0 +1,57 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, holoplush and magicplush modified by deltanedas (github), rainbowcarplush and inhand sprites modified from carpplush and inhand sprites by ArtisticRoomba", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "carpplush" + }, + { + "name": "carpplush-inhand-left", + "directions": 4 + }, + { + "name": "carpplush-inhand-right", + "directions": 4 + }, + { + "name": "magicplush" + }, + { + "name": "holoplush", + "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": "rainbowcarpplush" + }, + { + "name": "rainbowcarpplush-inhand-left", + "directions": 4 + }, + { + "name": "rainbowcarpplush-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/rainbowcarpplush-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-left.png rename to Resources/Textures/Objects/Fun/Plushies/carp.rsi/rainbowcarpplush-inhand-left.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/rainbowcarpplush-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-right.png rename to Resources/Textures/Objects/Fun/Plushies/carp.rsi/rainbowcarpplush-inhand-right.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush.png b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/rainbowcarpplush.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush.png rename to Resources/Textures/Objects/Fun/Plushies/carp.rsi/rainbowcarpplush.png diff --git a/Resources/Textures/Objects/Fun/Plushies/diona.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/meta.json new file mode 100644 index 0000000000..3843fed26f --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Sprites by discord user Deos#5630", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "plushie_diona" + }, + { + "name": "plushie_diona1" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_diona.png b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/plushie_diona.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_diona.png rename to Resources/Textures/Objects/Fun/Plushies/diona.rsi/plushie_diona.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_diona1.png b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/plushie_diona1.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_diona1.png rename to Resources/Textures/Objects/Fun/Plushies/diona.rsi/plushie_diona1.png diff --git a/Resources/Textures/Objects/Fun/expiplush.rsi/expi-equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/expi.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/Objects/Fun/expiplush.rsi/expi-equipped-HELMET.png rename to Resources/Textures/Objects/Fun/Plushies/expi.rsi/equipped-HELMET.png diff --git a/Resources/Textures/Objects/Fun/expiplush.rsi/expi.png b/Resources/Textures/Objects/Fun/Plushies/expi.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/expiplush.rsi/expi.png rename to Resources/Textures/Objects/Fun/Plushies/expi.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/expiplush.rsi/expi-inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/expi.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/expiplush.rsi/expi-inhand-left.png rename to Resources/Textures/Objects/Fun/Plushies/expi.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Fun/expiplush.rsi/expi-inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/expi.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/expiplush.rsi/expi-inhand-right.png rename to Resources/Textures/Objects/Fun/Plushies/expi.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Fun/Plushies/expi.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/expi.rsi/meta.json new file mode 100644 index 0000000000..9dbe9bf3fa --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/expi.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Made by Orsoniks (rivey0 on discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_hampter.png b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_hampter.png rename to Resources/Textures/Objects/Fun/Plushies/hampter.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/meta.json new file mode 100644 index 0000000000..ddeb50c744 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Sprite by RenLou#4333", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_human.png b/Resources/Textures/Objects/Fun/Plushies/human.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_human.png rename to Resources/Textures/Objects/Fun/Plushies/human.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/Plushies/human.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/human.rsi/meta.json new file mode 100644 index 0000000000..23d0f71a20 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/human.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Sprite by TheShuEd", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_lamp.png b/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_lamp.png rename to Resources/Textures/Objects/Fun/Plushies/lamp.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/meta.json new file mode 100644 index 0000000000..e5ddb0f4d7 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/lizard-equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/lizard.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/lizard-equipped-HELMET.png rename to Resources/Textures/Objects/Fun/Plushies/lizard.rsi/equipped-HELMET.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_lizard.png b/Resources/Textures/Objects/Fun/Plushies/lizard.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_lizard.png rename to Resources/Textures/Objects/Fun/Plushies/lizard.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushielizard-inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/lizard.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushielizard-inhand-left.png rename to Resources/Textures/Objects/Fun/Plushies/lizard.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushielizard-inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/lizard.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushielizard-inhand-right.png rename to Resources/Textures/Objects/Fun/Plushies/lizard.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Fun/Plushies/lizard.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/lizard.rsi/meta.json new file mode 100644 index 0000000000..c715673bb4 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/lizard.rsi/meta.json @@ -0,0 +1,67 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, equipped-HELMET sprite made by Cinder, in-hand lizard plushie sprites by KieueCaprie, plushie_lizard_inversed and inhand sprites modified from plushie_lizard_mirrored and plushielizard-inhand-left, plushielizard-inhand-right by ArtisticRoomba, spacelizard-equipped-HELMET by miamioni, spacelizard-inhand-(left/right) by SeamLesss (GitHub),", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "plushie_spacelizard" + }, + { + "name": "spacelizard-inhand-left", + "directions": 4 + }, + { + "name": "spacelizard-inhand-right", + "directions": 4 + }, + { + "name": "spacelizard-equipped-HELMET", + "directions": 4 + }, + { + "name": "rainbowlizardplush" + }, + { + "name": "rainbowlizardplush-inhand-left", + "directions": 4 + }, + { + "name": "rainbowlizardplush-inhand-right", + "directions": 4 + }, + { + "name": "plushie_lizard_inversed" + }, + { + "name": "plushielizardinversed-inhand-left", + "directions": 4 + }, + { + "name": "plushielizardinversed-inhand-right", + "directions": 4 + }, + { + "name": "plushielizardinversed-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_lizard_inversed.png b/Resources/Textures/Objects/Fun/Plushies/lizard.rsi/plushie_lizard_inversed.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_lizard_inversed.png rename to Resources/Textures/Objects/Fun/Plushies/lizard.rsi/plushie_lizard_inversed.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_spacelizard.png b/Resources/Textures/Objects/Fun/Plushies/lizard.rsi/plushie_spacelizard.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_spacelizard.png rename to Resources/Textures/Objects/Fun/Plushies/lizard.rsi/plushie_spacelizard.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/lizard-inversed-equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/lizard.rsi/plushielizardinversed-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/lizard-inversed-equipped-HELMET.png rename to Resources/Textures/Objects/Fun/Plushies/lizard.rsi/plushielizardinversed-equipped-HELMET.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushielizardinversed-inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/lizard.rsi/plushielizardinversed-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushielizardinversed-inhand-left.png rename to Resources/Textures/Objects/Fun/Plushies/lizard.rsi/plushielizardinversed-inhand-left.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushielizardinversed-inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/lizard.rsi/plushielizardinversed-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushielizardinversed-inhand-right.png rename to Resources/Textures/Objects/Fun/Plushies/lizard.rsi/plushielizardinversed-inhand-right.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush-inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/lizard.rsi/rainbowlizardplush-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush-inhand-left.png rename to Resources/Textures/Objects/Fun/Plushies/lizard.rsi/rainbowlizardplush-inhand-left.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush-inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/lizard.rsi/rainbowlizardplush-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush-inhand-right.png rename to Resources/Textures/Objects/Fun/Plushies/lizard.rsi/rainbowlizardplush-inhand-right.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush.png b/Resources/Textures/Objects/Fun/Plushies/lizard.rsi/rainbowlizardplush.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush.png rename to Resources/Textures/Objects/Fun/Plushies/lizard.rsi/rainbowlizardplush.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/spacelizard-equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/lizard.rsi/spacelizard-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/spacelizard-equipped-HELMET.png rename to Resources/Textures/Objects/Fun/Plushies/lizard.rsi/spacelizard-equipped-HELMET.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/spacelizard-inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/lizard.rsi/spacelizard-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/spacelizard-inhand-left.png rename to Resources/Textures/Objects/Fun/Plushies/lizard.rsi/spacelizard-inhand-left.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/spacelizard-inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/lizard.rsi/spacelizard-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/spacelizard-inhand-right.png rename to Resources/Textures/Objects/Fun/Plushies/lizard.rsi/spacelizard-inhand-right.png diff --git a/Resources/Textures/Objects/Fun/Plushies/meta.json b/Resources/Textures/Objects/Fun/Plushies/meta.json new file mode 100644 index 0000000000..e5ddb0f4d7 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_moth.png b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_moth.png rename to Resources/Textures/Objects/Fun/Plushies/moth.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/Plushies/moth.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/meta.json new file mode 100644 index 0000000000..e5ddb0f4d7 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/narplush.png b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/narplush.png rename to Resources/Textures/Objects/Fun/Plushies/narsie.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/meta.json new file mode 100644 index 0000000000..e5ddb0f4d7 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_nuke.png b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_nuke.png rename to Resources/Textures/Objects/Fun/Plushies/nukie.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/meta.json new file mode 100644 index 0000000000..e5ddb0f4d7 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_penguin.png b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_penguin.png rename to Resources/Textures/Objects/Fun/Plushies/penguin.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/meta.json new file mode 100644 index 0000000000..95024a5e4a --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Sprite by netwy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_ratvar.png b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_ratvar.png rename to Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/meta.json new file mode 100644 index 0000000000..e5ddb0f4d7 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_rouny.png b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_rouny.png rename to Resources/Textures/Objects/Fun/Plushies/rouny.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/meta.json new file mode 100644 index 0000000000..5be34bc591 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/shark.rsi/blue-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-left.png rename to Resources/Textures/Objects/Fun/Plushies/shark.rsi/blue-inhand-left.png diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/shark.rsi/blue-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-right.png rename to Resources/Textures/Objects/Fun/Plushies/shark.rsi/blue-inhand-right.png diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/blue.png b/Resources/Textures/Objects/Fun/Plushies/shark.rsi/blue.png similarity index 100% rename from Resources/Textures/Objects/Fun/sharkplush.rsi/blue.png rename to Resources/Textures/Objects/Fun/Plushies/shark.rsi/blue.png diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/shark.rsi/grey-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-left.png rename to Resources/Textures/Objects/Fun/Plushies/shark.rsi/grey-inhand-left.png diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/shark.rsi/grey-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-right.png rename to Resources/Textures/Objects/Fun/Plushies/shark.rsi/grey-inhand-right.png diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/grey.png b/Resources/Textures/Objects/Fun/Plushies/shark.rsi/grey.png similarity index 100% rename from Resources/Textures/Objects/Fun/sharkplush.rsi/grey.png rename to Resources/Textures/Objects/Fun/Plushies/shark.rsi/grey.png diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/shark.rsi/meta.json similarity index 99% rename from Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json rename to Resources/Textures/Objects/Fun/Plushies/shark.rsi/meta.json index 12144d3559..33604c15fd 100644 --- a/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/shark.rsi/meta.json @@ -41,4 +41,4 @@ "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/Plushies/shark.rsi/pink-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-left.png rename to Resources/Textures/Objects/Fun/Plushies/shark.rsi/pink-inhand-left.png diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/shark.rsi/pink-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-right.png rename to Resources/Textures/Objects/Fun/Plushies/shark.rsi/pink-inhand-right.png diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/pink.png b/Resources/Textures/Objects/Fun/Plushies/shark.rsi/pink.png similarity index 100% rename from Resources/Textures/Objects/Fun/sharkplush.rsi/pink.png rename to Resources/Textures/Objects/Fun/Plushies/shark.rsi/pink.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_slime.png b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_slime.png rename to Resources/Textures/Objects/Fun/Plushies/slime.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/Plushies/slime.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/meta.json new file mode 100644 index 0000000000..e5ddb0f4d7 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-equipped-NECK.png b/Resources/Textures/Objects/Fun/Plushies/snake.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-equipped-NECK.png rename to Resources/Textures/Objects/Fun/Plushies/snake.rsi/equipped-NECK.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_snake.png b/Resources/Textures/Objects/Fun/Plushies/snake.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_snake.png rename to Resources/Textures/Objects/Fun/Plushies/snake.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/snake.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-inhand-left.png rename to Resources/Textures/Objects/Fun/Plushies/snake.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/snake.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-inhand-right.png rename to Resources/Textures/Objects/Fun/Plushies/snake.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Fun/Plushies/snake.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/snake.rsi/meta.json new file mode 100644 index 0000000000..2db3921089 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/snake.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, inhand and neck sprites by TiniestShark (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_vox.png b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_vox.png rename to Resources/Textures/Objects/Fun/Plushies/vox.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/Plushies/vox.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/meta.json new file mode 100644 index 0000000000..e36a30b200 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Sprite by LinkUyx#6557", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_xeno.png b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/plushie_xeno.png rename to Resources/Textures/Objects/Fun/Plushies/xeno.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/meta.json new file mode 100644 index 0000000000..e36a30b200 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Sprite by LinkUyx#6557", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/base.png b/Resources/Textures/Objects/Fun/capgun.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/base.png rename to Resources/Textures/Objects/Fun/capgun.rsi/base.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/bolt-closed.png b/Resources/Textures/Objects/Fun/capgun.rsi/bolt-closed.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/bolt-closed.png rename to Resources/Textures/Objects/Fun/capgun.rsi/bolt-closed.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/bolt-open.png b/Resources/Textures/Objects/Fun/capgun.rsi/bolt-open.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/bolt-open.png rename to Resources/Textures/Objects/Fun/capgun.rsi/bolt-open.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/capbullet.png b/Resources/Textures/Objects/Fun/capgun.rsi/capbullet.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/capbullet.png rename to Resources/Textures/Objects/Fun/capgun.rsi/capbullet.png diff --git a/Resources/Textures/Objects/Fun/capgun.rsi/icon.png b/Resources/Textures/Objects/Fun/capgun.rsi/icon.png new file mode 100644 index 0000000000..4a17606cbd Binary files /dev/null and b/Resources/Textures/Objects/Fun/capgun.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/capgun-inhand-left.png b/Resources/Textures/Objects/Fun/capgun.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/capgun-inhand-left.png rename to Resources/Textures/Objects/Fun/capgun.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/capgun-inhand-right.png b/Resources/Textures/Objects/Fun/capgun.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/capgun-inhand-right.png rename to Resources/Textures/Objects/Fun/capgun.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Fun/capgun.rsi/meta.json b/Resources/Textures/Objects/Fun/capgun.rsi/meta.json new file mode 100644 index 0000000000..5dda8fe6a5 --- /dev/null +++ b/Resources/Textures/Objects/Fun/capgun.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "bolt-closed" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "capbullet" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/expiplush.rsi/meta.json b/Resources/Textures/Objects/Fun/expiplush.rsi/meta.json deleted file mode 100644 index deaad8855a..0000000000 --- a/Resources/Textures/Objects/Fun/expiplush.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC0-1.0", - "copyright": "Made by Orsoniks (rivey0 on discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "expi" - }, - { - "name": "expi-inhand-left", - "directions": 4 - }, - { - "name": "expi-inhand-right", - "directions": 4 - }, - { - "name": "expi-equipped-HELMET", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Fun/toys.rsi/orb.png b/Resources/Textures/Objects/Fun/pondering_orb.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/orb.png rename to Resources/Textures/Objects/Fun/pondering_orb.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/orb-inhand-left.png b/Resources/Textures/Objects/Fun/pondering_orb.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/orb-inhand-left.png rename to Resources/Textures/Objects/Fun/pondering_orb.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/orb-inhand-right.png b/Resources/Textures/Objects/Fun/pondering_orb.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/orb-inhand-right.png rename to Resources/Textures/Objects/Fun/pondering_orb.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Fun/pondering_orb.rsi/meta.json b/Resources/Textures/Objects/Fun/pondering_orb.rsi/meta.json new file mode 100644 index 0000000000..418629941e --- /dev/null +++ b/Resources/Textures/Objects/Fun/pondering_orb.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Sprites created by Pancake", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rubber_chicken.png b/Resources/Textures/Objects/Fun/rubber_chicken.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/rubber_chicken.png rename to Resources/Textures/Objects/Fun/rubber_chicken.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/rubber_chicken.rsi/meta.json b/Resources/Textures/Objects/Fun/rubber_chicken.rsi/meta.json new file mode 100644 index 0000000000..2b9f6ab0c4 --- /dev/null +++ b/Resources/Textures/Objects/Fun/rubber_chicken.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Sprite by xprospero", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/spbox.png b/Resources/Textures/Objects/Fun/snap_pops.rsi/box.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/spbox.png rename to Resources/Textures/Objects/Fun/snap_pops.rsi/box.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/snappop.png b/Resources/Textures/Objects/Fun/snap_pops.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/snappop.png rename to Resources/Textures/Objects/Fun/snap_pops.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/snap_pops.rsi/meta.json b/Resources/Textures/Objects/Fun/snap_pops.rsi/meta.json new file mode 100644 index 0000000000..82f35e4b1c --- /dev/null +++ b/Resources/Textures/Objects/Fun/snap_pops.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "box" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/ian.png b/Resources/Textures/Objects/Fun/toy_ian.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/ian.png rename to Resources/Textures/Objects/Fun/toy_ian.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/toy_ian.rsi/meta.json b/Resources/Textures/Objects/Fun/toy_ian.rsi/meta.json new file mode 100644 index 0000000000..e5ddb0f4d7 --- /dev/null +++ b/Resources/Textures/Objects/Fun/toy_ian.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/mouse-equipped-HELMET.png b/Resources/Textures/Objects/Fun/toy_mouse.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/mouse-equipped-HELMET.png rename to Resources/Textures/Objects/Fun/toy_mouse.rsi/equipped-HELMET.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/toy_mouse.png b/Resources/Textures/Objects/Fun/toy_mouse.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/toy_mouse.png rename to Resources/Textures/Objects/Fun/toy_mouse.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/toy_mouse.rsi/meta.json b/Resources/Textures/Objects/Fun/toy_mouse.rsi/meta.json new file mode 100644 index 0000000000..f917441a32 --- /dev/null +++ b/Resources/Textures/Objects/Fun/toy_mouse.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/nuketoy.png b/Resources/Textures/Objects/Fun/toy_nuke.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/nuketoy.png rename to Resources/Textures/Objects/Fun/toy_nuke.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/toy_nuke.rsi/meta.json b/Resources/Textures/Objects/Fun/toy_nuke.rsi/meta.json new file mode 100644 index 0000000000..f61272b0d3 --- /dev/null +++ b/Resources/Textures/Objects/Fun/toy_nuke.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.2, + 0.2 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/singularitytoy.png b/Resources/Textures/Objects/Fun/toy_singularity.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/singularitytoy.png rename to Resources/Textures/Objects/Fun/toy_singularity.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/toy_singularity.rsi/meta.json b/Resources/Textures/Objects/Fun/toy_singularity.rsi/meta.json new file mode 100644 index 0000000000..6f1abc4d4f --- /dev/null +++ b/Resources/Textures/Objects/Fun/toy_singularity.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json deleted file mode 100644 index 837f7e921c..0000000000 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ /dev/null @@ -1,425 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github), lizard hat sprite made by Cinder, rubber_chicken by xprospero, in-hand lizard plushie sprites by KieueCaprie, plushie_lizard_inversed and inhand sprites modified from plushie_lizard_mirrored and plushielizard-inhand-left, plushielizard-inhand-right by ArtisticRoomba, rainbowcarplush and inhand sprites modified from carpplush and inhand sprites by ArtisticRoomba, spacelizard-equipped-HELMET by miamioni, spacelizard-inhand-(left/right) by SeamLesss (GitHub), plushiesnake inhands+neck by TiniestShark (GitHub)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "plushie_ratvar" - }, - { - "name": "plushie_penguin" - }, - { - "name": "plushie_moth" - }, - { - "name": "plushie_rouny", - "directions": 4 - }, - { - "name": "plushie_lizard" - }, - { - "name": "plushielizard-inhand-left", - "directions": 4 - }, - { - "name": "plushielizard-inhand-right", - "directions": 4 - }, - { - "name": "lizard-equipped-HELMET", - "directions": 4 - }, - { - "name": "plushie_spacelizard" - }, - { - "name": "carpplush" - }, - { - "name": "holoplush", - "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": "magicplush" - }, - { - "name": "rainbowcarpplush" - }, - { - "name": "rainbowcarpplush-inhand-left", - "directions": 4 - }, - { - "name": "rainbowcarpplush-inhand-right", - "directions": 4 - }, - { - "name": "rainbowlizardplush" - }, - { - "name": "rainbowlizardplush-inhand-left", - "directions": 4 - }, - { - "name": "rainbowlizardplush-inhand-right", - "directions": 4 - }, - { - "name": "narplush" - }, - { - "name": "plushie_h" - }, - { - "name": "bee-equipped-HELMET", - "directions": 4 - }, - { - "name": "bee-inhand-left", - "directions": 4 - }, - { - "name": "bee-inhand-right", - "directions": 4 - }, - { - "name": "plushie_hampter" - }, - { - "name": "plushie_arachnid" - }, - { - "name": "plushie_lizard_inversed" - }, - { - "name": "lizard-inversed-equipped-HELMET", - "directions": 4 - }, - { - "name": "plushielizardinversed-inhand-left", - "directions": 4 - }, - { - "name": "plushielizardinversed-inhand-right", - "directions": 4 - }, - { - "name": "plushie_lamp" - }, - { - "name": "plushie_nuke" - }, - { - "name": "plushie_atmosian" - }, - { - "name": "plushie_slime" - }, - { - "name": "plushie_snake" - }, - { - "name": "plushiesnake-equipped-NECK", - "directions": 4 - }, - { - "name": "plushiesnake-inhand-left", - "directions": 4 - }, - { - "name": "plushiesnake-inhand-right", - "directions": 4 - }, - { - "name": "plushie_vox" - }, - { - "name": "plushie_diona" - }, - { - "name": "plushie_human" - }, - { - "name": "plushie_diona1" - }, - { - "name": "plushie_xeno" - }, - { - "name": "carpplush-inhand-left", - "directions": 4 - }, - { - "name": "carpplush-inhand-right", - "directions": 4 - }, - { - "name": "AI" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "foamblade" - }, - { - "name": "foamcrossbow" - }, - { - "name": "foamdart" - }, - { - "name": "foambox" - }, - { - "name": "ian" - }, - { - "name": "nuketoy" - }, - { - "name": "snappop" - }, - { - "name": "spacelizard-equipped-HELMET", - "directions": 4 - }, - { - "name": "spacelizard-inhand-right", - "directions": 4 - }, - { - "name": "spacelizard-inhand-left", - "directions": 4 - }, - { - "name": "spbox" - }, - { - "name": "toy_mouse" - }, - { - "name": "mouse-equipped-HELMET", - "directions": 4 - }, - { - "name": "capbullet" - }, - { - "name": "foamcrossbow-inhand-right", - "directions": 4 - }, - { - "name": "foamcrossbow-inhand-left", - "directions": 4 - }, - { - "name": "capgun-inhand-right", - "directions": 4 - }, - { - "name": "capgun-inhand-left", - "directions": 4 - }, - { - "name": "foamblade-inhand-right", - "directions": 4 - }, - { - "name": "foamblade-inhand-left", - "directions": 4 - }, - { - "name": "corgib-inhand-right", - "directions": 4 - }, - { - "name": "corgib-inhand-left", - "directions": 4 - }, - { - "name": "ntb-inhand-right", - "directions": 4 - }, - { - "name": "ntb-inhand-left", - "directions": 4 - }, - { - "name": "synb-inhand-left", - "directions": 4 - }, - { - "name": "synb-inhand-right", - "directions": 4 - }, - { - "name": "synb" - }, - { - "name": "ntb" - }, - { - "name": "corgib" - }, - { - "name": "football" - }, - { - "name": "footb-inhand-right", - "directions": 4 - }, - { - "name": "footb-inhand-left", - "directions": 4 - }, - { - "name": "basketball" - }, - { - "name": "bask-inhand-right", - "directions": 4, - "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, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "bask-inhand-left", - "directions": 4, - "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, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "singularitytoy", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "orb", - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "orb-inhand-left", - "directions": 4 - }, - { - "name": "orb-inhand-right", - "directions": 4 - }, - { - "name": "beachball" - }, - { - "name": "beachb-inhand-left", - "directions": 4 - }, - { - "name": "beachb-inhand-right", - "directions": 4 - }, - { - "name": "rubber_chicken" - } - ] -}