diff --git a/Content.Client/IgnoredComponents.cs b/Content.Client/IgnoredComponents.cs index 2c01b43bb9..0a7b44f03e 100644 --- a/Content.Client/IgnoredComponents.cs +++ b/Content.Client/IgnoredComponents.cs @@ -130,6 +130,7 @@ "PowerReceiver", "Wire", "StressTestMovement", + "Toys" }; } } diff --git a/Content.Server/GameObjects/Components/Items/ToysComponent.cs b/Content.Server/GameObjects/Components/Items/ToysComponent.cs new file mode 100644 index 0000000000..fdbf4d3347 --- /dev/null +++ b/Content.Server/GameObjects/Components/Items/ToysComponent.cs @@ -0,0 +1,72 @@ +using Content.Server.GameObjects.Components.Sound; +using Content.Server.GameObjects.EntitySystems; +using Content.Server.Utility; +using Content.Shared.Audio; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Shared.Audio; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Random; +using Robust.Shared.IoC; +using Robust.Shared.Localization; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; +using Robust.Shared.ViewVariables; + +namespace Content.Server.GameObjects.Components.Items +{ + [RegisterComponent] + public class ToysComponent : Component, IActivate, IUse, ILand + { +#pragma warning disable 649 + [Dependency] private readonly IPrototypeManager _prototypeManager; + [Dependency] private readonly IRobustRandom _random; +#pragma warning restore 649 + + public override string Name => "Toys"; + + [ViewVariables] + public string _soundCollectionName = "ToySqueak"; + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + serializer.DataField(ref _soundCollectionName, "toySqueak", "ToySqueak"); + } + + public void Squeak() + { + PlaySqueakEffect(); + } + + public void PlaySqueakEffect() + { + if (!string.IsNullOrWhiteSpace(_soundCollectionName)) + { + var soundCollection = _prototypeManager.Index(_soundCollectionName); + var file = _random.Pick(soundCollection.PickFiles); + EntitySystem.Get().PlayFromEntity(file, Owner, AudioParams.Default); + } + } + + public void Activate(ActivateEventArgs eventArgs) + { + Squeak(); + } + + public bool UseEntity(UseEntityEventArgs eventArgs) + { + Squeak(); + return false; + } + public void Land(LandEventArgs eventArgs) + { + Squeak(); + } + } +} + diff --git a/Content.Server/GameObjects/Components/Sound/EmitSoundOnThrowComponent.cs b/Content.Server/GameObjects/Components/Sound/EmitSoundOnThrowComponent.cs new file mode 100644 index 0000000000..19d6f81922 --- /dev/null +++ b/Content.Server/GameObjects/Components/Sound/EmitSoundOnThrowComponent.cs @@ -0,0 +1,47 @@ +using Content.Server.GameObjects.EntitySystems; +using Content.Shared.Audio; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Shared.Audio; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Serialization; + +namespace Content.Server.GameObjects.Components.Sound +{ + /// + /// Simple sound emitter that emits sound on use in hand + /// + [RegisterComponent] + public class EmitSoundOnThrowComponent : Component, ILand + { + /// + /// + public override string Name => "EmitSoundOnThrow"; + + public string _soundName; + public float _pitchVariation; + + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + serializer.DataField(ref _soundName, "sound", string.Empty); + serializer.DataField(ref _pitchVariation, "variation", 0.0f); + } + public void PlaySoundEffect() + { + if (!string.IsNullOrWhiteSpace(_soundName)) + { + if (_pitchVariation > 0.0) + { + EntitySystem.Get().PlayFromEntity(_soundName, Owner, AudioHelpers.WithVariation(_pitchVariation).WithVolume(-2f)); + } + EntitySystem.Get().PlayFromEntity(_soundName, Owner, AudioParams.Default.WithVolume(-2f)); + } + } + public void Land(LandEventArgs eventArgs) + { + PlaySoundEffect(); + } + } +} diff --git a/Resources/Audio/items/toys/bee.ogg b/Resources/Audio/items/toys/bee.ogg new file mode 100644 index 0000000000..d690f1f771 Binary files /dev/null and b/Resources/Audio/items/toys/bee.ogg differ diff --git a/Resources/Audio/items/toys/hellothere.ogg b/Resources/Audio/items/toys/hellothere.ogg new file mode 100644 index 0000000000..22f6733bdb Binary files /dev/null and b/Resources/Audio/items/toys/hellothere.ogg differ diff --git a/Resources/Audio/items/toys/helpme.ogg b/Resources/Audio/items/toys/helpme.ogg new file mode 100644 index 0000000000..ebb4c79bdb Binary files /dev/null and b/Resources/Audio/items/toys/helpme.ogg differ diff --git a/Resources/Audio/items/toys/ian.ogg b/Resources/Audio/items/toys/ian.ogg new file mode 100644 index 0000000000..80ee8e62b7 Binary files /dev/null and b/Resources/Audio/items/toys/ian.ogg differ diff --git a/Resources/Audio/items/toys/imsorry.ogg b/Resources/Audio/items/toys/imsorry.ogg new file mode 100644 index 0000000000..c5c93b1bfc Binary files /dev/null and b/Resources/Audio/items/toys/imsorry.ogg differ diff --git a/Resources/Audio/items/toys/meow1.ogg b/Resources/Audio/items/toys/meow1.ogg new file mode 100644 index 0000000000..462f246d55 Binary files /dev/null and b/Resources/Audio/items/toys/meow1.ogg differ diff --git a/Resources/Audio/items/toys/mousesqueek.ogg b/Resources/Audio/items/toys/mousesqueek.ogg new file mode 100644 index 0000000000..fef15503cd Binary files /dev/null and b/Resources/Audio/items/toys/mousesqueek.ogg differ diff --git a/Resources/Audio/items/toys/rattle.ogg b/Resources/Audio/items/toys/rattle.ogg new file mode 100644 index 0000000000..7c0cf1104b Binary files /dev/null and b/Resources/Audio/items/toys/rattle.ogg differ diff --git a/Resources/Audio/items/toys/thankyou.ogg b/Resources/Audio/items/toys/thankyou.ogg new file mode 100644 index 0000000000..263155e526 Binary files /dev/null and b/Resources/Audio/items/toys/thankyou.ogg differ diff --git a/Resources/Audio/items/toys/toysqueak1.ogg b/Resources/Audio/items/toys/toysqueak1.ogg new file mode 100644 index 0000000000..57b962726c Binary files /dev/null and b/Resources/Audio/items/toys/toysqueak1.ogg differ diff --git a/Resources/Audio/items/toys/toysqueak2.ogg b/Resources/Audio/items/toys/toysqueak2.ogg new file mode 100644 index 0000000000..05ca302a23 Binary files /dev/null and b/Resources/Audio/items/toys/toysqueak2.ogg differ diff --git a/Resources/Audio/items/toys/toysqueak3.ogg b/Resources/Audio/items/toys/toysqueak3.ogg new file mode 100644 index 0000000000..5dcdc70f01 Binary files /dev/null and b/Resources/Audio/items/toys/toysqueak3.ogg differ diff --git a/Resources/Audio/items/toys/verygood.ogg b/Resources/Audio/items/toys/verygood.ogg new file mode 100644 index 0000000000..68f62169e0 Binary files /dev/null and b/Resources/Audio/items/toys/verygood.ogg differ diff --git a/Resources/Audio/weapons/click.ogg b/Resources/Audio/weapons/click.ogg new file mode 100644 index 0000000000..b3947c86e0 Binary files /dev/null and b/Resources/Audio/weapons/click.ogg differ diff --git a/Resources/Audio/weapons/drawbow2.ogg b/Resources/Audio/weapons/drawbow2.ogg new file mode 100644 index 0000000000..9fa5f7cf9f Binary files /dev/null and b/Resources/Audio/weapons/drawbow2.ogg differ diff --git a/Resources/Prototypes/Entities/Items/skub.yml b/Resources/Prototypes/Entities/Items/skub.yml index 44e56fa08b..de83fc91ba 100644 --- a/Resources/Prototypes/Entities/Items/skub.yml +++ b/Resources/Prototypes/Entities/Items/skub.yml @@ -7,18 +7,14 @@ - type: Sprite sprite: Objects/Misc/skub.rsi state: icon - - type: Icon sprite: Objects/Misc/skub.rsi state: icon - - type: Item sprite: Objects/Misc/skub.rsi - type: ItemCooldown - - type: LoopingSound - type: EmitSoundOnUse sound: /Audio/items/skub.ogg - - type: UseDelay delay: 2.0 diff --git a/Resources/Prototypes/Entities/Items/toys.yml b/Resources/Prototypes/Entities/Items/toys.yml new file mode 100644 index 0000000000..d156c8571a --- /dev/null +++ b/Resources/Prototypes/Entities/Items/toys.yml @@ -0,0 +1,693 @@ +## Plushies + +- type: entity + name: bee plushie + parent: BaseItem + id: PlushieBee + description: A cute toy that resembles an even cuter coder. + components: + - type: Toys + - type: LoopingSound + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: plushie_h + - type: Icon + sprite: Objects/Fun/toys.rsi + state: plushie_h + - type: ItemCooldown + - type: UseDelay + delay: 1.0 + +- type: entity + name: nukie plushie + parent: BaseItem + id: PlushieNuke + description: A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious. + components: + - type: Toys + - type: LoopingSound + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: plushie_nuke + - type: Icon + sprite: Objects/Fun/toys.rsi + state: plushie_nuke + - type: ItemCooldown + - type: UseDelay + delay: 1.0 + +- type: entity + name: lizard plushie + parent: BaseItem + id: PlushieLizard + description: An adorable stuffed toy that resembles a lizardperson. + components: + - type: Toys + - type: LoopingSound + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: plushie_lizard + - type: Icon + sprite: Objects/Fun/toys.rsi + state: plushie_lizard + - type: ItemCooldown + - type: UseDelay + delay: 1.0 + +- type: entity + name: nar'sie plushie + parent: BaseItem + id: PlushieNar + description: A small stuffed doll of the elder goddess Nar'Sie. Who thought this was a good children's toy? + components: + - type: Toys + - type: LoopingSound + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: narplush + - type: Icon + sprite: Objects/Fun/toys.rsi + state: narplush + - type: ItemCooldown + - type: UseDelay + delay: 1.0 + +- type: entity + name: carp plushie + parent: BaseItem + id: PlushieCarp + description: An adorable stuffed toy that resembles a space carp. + components: + - type: Toys + - type: LoopingSound + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: carpplush + - type: Icon + sprite: Objects/Fun/toys.rsi + state: carpplush + - type: Item + sprite: Objects/Fun/toys.rsi + HeldPrefix: carpplush + - type: ItemCooldown + - type: UseDelay + delay: 1.0 + +- type: entity + name: slime plushie + parent: BaseItem + id: PlushieSlime + description: An adorable stuffed toy that resembles a slime. It's basically a hacky sack. + components: + - type: Toys + - type: LoopingSound + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: plushie_slime + - type: Icon + sprite: Objects/Fun/toys.rsi + state: plushie_slime + - type: ItemCooldown + - type: UseDelay + delay: 1.0 + +- type: entity + name: snake plushie + parent: BaseItem + id: PlushieSnake + description: An adorable stuffed toy that resembles a snake. Not to be mistaken for the real thing. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: plushie_snake + - type: Icon + sprite: Objects/Fun/toys.rsi + state: plushie_snake + - type: ItemCooldown + - type: LoopingSound + - type: EmitSoundOnUse + sound: /Audio/items/toys/rattle.ogg + - type: UseDelay + delay: 1.0 + +- type: entity + name: mouse toy + parent: BaseItem + id: ToyMouse + description: A colorful toy mouse! + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: toy_mouse + - type: Icon + sprite: Objects/Fun/toys.rsi + state: toy_mouse + - type: ItemCooldown + - type: LoopingSound + - type: EmitSoundOnUse + sound: /Audio/items/toys/mousesqueek.ogg + - type: UseDelay + delay: 1.0 + +- type: entity + name: help me carving + parent: BaseItem + id: CarvingHelpMe + description: Help me... + components: + - type: Sprite + sprite: Objects/Misc/carvings.rsi + state: helpme + - type: Icon + sprite: Objects/Misc/carvings.rsi + state: helpme + - type: Item + sprite: Objects/Misc/carvings.rsi + - type: EmitSoundOnThrow + sound: /Audio/items/toys/helpme.ogg + - type: ItemCooldown + - type: LoopingSound + - type: EmitSoundOnUse + sound: /Audio/items/toys/helpme.ogg + - type: UseDelay + delay: 1.0 + +# All using the same sprite until Bright gives me sprites the rest. + +- type: entity + name: hello carving + parent: BaseItem + id: CarvingHello + description: Hello! + components: + - type: Sprite + sprite: Objects/Misc/carvings.rsi + state: helpme + - type: Icon + sprite: Objects/Misc/carvings.rsi + state: helpme + - type: Item + sprite: Objects/Misc/carvings.rsi + - type: EmitSoundOnThrow + sound: /Audio/items/toys/hellothere.ogg + - type: ItemCooldown + - type: LoopingSound + - type: EmitSoundOnUse + sound: /Audio/items/toys/hellothere.ogg + - type: UseDelay + delay: 1.0 + +- type: entity + name: thank you carving + parent: BaseItem + id: CarvingThankYou + description: Thank you! + components: + - type: Sprite + sprite: Objects/Misc/carvings.rsi + state: helpme + - type: Icon + sprite: Objects/Misc/carvings.rsi + state: helpme + - type: Item + sprite: Objects/Misc/carvings.rsi + - type: EmitSoundOnThrow + sound: /Audio/items/toys/thankyou.ogg + - type: ItemCooldown + - type: LoopingSound + - type: EmitSoundOnUse + sound: /Audio/items/toys/thankyou.ogg + - type: UseDelay + delay: 1.0 + +- type: entity + name: very good carving + parent: BaseItem + id: CarvingVeryGood + description: Very Good! + components: + - type: Sprite + sprite: Objects/Misc/carvings.rsi + state: helpme + - type: Icon + sprite: Objects/Misc/carvings.rsi + state: helpme + - type: Item + sprite: Objects/Misc/carvings.rsi + - type: EmitSoundOnThrow + sound: /Audio/items/toys/verygood.ogg + - type: ItemCooldown + - type: LoopingSound + - type: EmitSoundOnUse + sound: /Audio/items/toys/verygood.ogg + - type: UseDelay + delay: 1.0 + +- type: entity + name: sorry carving + parent: BaseItem + id: CarvingImSorry + description: I'm sorry... + components: + - type: Sprite + sprite: Objects/Misc/carvings.rsi + state: helpme + - type: Icon + sprite: Objects/Misc/carvings.rsi + state: helpme + - type: Item + sprite: Objects/Misc/carvings.rsi + - type: EmitSoundOnThrow + sound: /Audio/items/toys/imsorry.ogg + - type: ItemCooldown + - type: LoopingSound + - type: EmitSoundOnUse + sound: /Audio/items/toys/imsorry.ogg + - type: UseDelay + delay: 1.0 + +## Figurines + +- type: entity + name: AI toy + parent: BaseItem + id: ToyAi + description: A little toy model AI core. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: AI + - type: Icon + sprite: Objects/Fun/toys.rsi + state: AI + +- type: entity + name: nuke toy + parent: BaseItem + id: ToyNuke + description: A plastic model of a Nuclear Fission Explosive. What child plays with this? + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: nuketoy + - type: Icon + sprite: Objects/Fun/toys.rsi + state: nuketoy + +- type: entity + name: assistant toy + parent: BaseItem + id: ToyAssistant + description: Grey tide world wide! + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: doll + - type: Icon + sprite: Objects/Fun/toys.rsi + state: doll + - type: Item + sprite: Objects/Fun/toys.rsi + HeldPrefix: doll + +- type: entity + name: griffin toy + parent: BaseItem + id: ToyGriffin + description: An action figure modeled after 'The Griffin', criminal mastermind. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: griffinprize + - type: Icon + sprite: Objects/Fun/toys.rsi + state: griffinprize + +- type: entity + name: h.o.n.k. toy + parent: BaseItem + id: ToyHonk + description: Mini-Mecha action figure! Collect them all! 6/12. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: honkprize + - type: Icon + sprite: Objects/Fun/toys.rsi + state: honkprize + +- type: entity + name: ian toy + parent: BaseItem + id: ToyIan + description: Ian action figure + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: ian + - type: Icon + sprite: Objects/Fun/toys.rsi + state: ian + - type: ItemCooldown + - type: LoopingSound + - type: EmitSoundOnUse + sound: /Audio/items/toys/ian.ogg + - type: UseDelay + delay: 1.0 + +- type: entity + name: marauder toy + parent: BaseItem + id: ToyMarauder + description: Mini-Mecha action figure! Collect them all! 7/12. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: marauderprize + - type: Icon + sprite: Objects/Fun/toys.rsi + state: marauderprize + +- type: entity + name: mauler toy + parent: BaseItem + id: ToyMauler + description: Mini-Mecha action figure! Collect them all! 9/12. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: maulerprize + - type: Icon + sprite: Objects/Fun/toys.rsi + state: maulerprize + +- type: entity + name: gygax toy + parent: BaseItem + id: ToyGygax + description: Mini-Mecha action figure! Collect them all! 4/12. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: gygaxtoy + - type: Icon + sprite: Objects/Fun/toys.rsi + state: gygaxtoy + +- type: entity + name: odysseus toy + parent: BaseItem + id: ToyOdysseus + description: Mini-Mecha action figure! Collect them all! 10/12. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: odysseusprize + - type: Icon + sprite: Objects/Fun/toys.rsi + state: odysseusprize + +- type: entity + name: owl toy + parent: BaseItem + id: ToyOwlman + description: An action figure modeled after 'The Owl', defender of justice. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: owlprize + - type: Icon + sprite: Objects/Fun/toys.rsi + state: owlprize + +- type: entity + name: deathripley toy + parent: BaseItem + id: ToyDeathRipley + description: Mini-Mecha action figure! Collect them all! 3/12. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: deathripleytoy + - type: Icon + sprite: Objects/Fun/toys.rsi + state: deathripleytoy + +- type: entity + name: phazon toy + parent: BaseItem + id: ToyPhazon + description: Mini-Mecha action figure! Collect them all! 11/12. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: phazonprize + - type: Icon + sprite: Objects/Fun/toys.rsi + state: phazonprize + +- type: entity + name: fire ripley + parent: BaseItem + id: ToyFireRipley + description: Mini-Mecha action figure! Collect them all! 2/12. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: fireripleytoy + - type: Icon + sprite: Objects/Fun/toys.rsi + state: fireripleytoy + +- type: entity + name: reticence toy + parent: BaseItem + id: ToyReticence + description: Mini-Mecha action figure! Collect them all! 12/12. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: reticenceprize + - type: Icon + sprite: Objects/Fun/toys.rsi + state: reticenceprize + +- type: entity + name: ripley toy + parent: BaseItem + id: ToyRipley + description: Mini-Mecha action figure! Collect them all! 1/12. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: ripleytoy + - type: Icon + sprite: Objects/Fun/toys.rsi + state: ripleytoy + +- type: entity + name: seraph toy + parent: BaseItem + id: ToySeraph + description: Mini-Mecha action figure! Collect them all! 8/12. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: seraphprize + - type: Icon + sprite: Objects/Fun/toys.rsi + state: seraphprize + +- type: entity + name: durand toy + parent: BaseItem + id: ToyDurand + description: Mini-Mecha action figure! Collect them all! 5/12. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: durandprize + - type: Icon + sprite: Objects/Fun/toys.rsi + state: durandprize + +### Yeah I left these all mixed up for a future coder to puzzle over, it's lore. + +- type: entity + name: skeleton toy + parent: BaseItem + id: ToySkeleton + description: Spooked yah! + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: skeletonprize + - type: Icon + sprite: Objects/Fun/toys.rsi + state: skeletonprize + +## Toyweapons + +- type: entity + name: foam weapon base + parent: BaseItem + id: FoamWeaponBase + description: + abstract: true + components: + - type: Sprite + netsync: false + - type: Icon + state: icon + - type: Item + size: 24 + state: icon + +- type: entity + name: foam crossbow + parent: FoamWeaponBase + id: FoamCrossbow + description: Aiming this at Security may get you filled with lead. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: foamcrossbow + - type: Icon + sprite: Objects/Fun/toys.rsi + state: foamcrossbow + - type: Item + Size: 24 + sprite: Objects/Fun/toys.rsi + HeldPrefix: foamcrossbow + - type: RangedWeapon + - type: RevolverBarrel + caliber: Rocket + currentSelector: Single + allSelectors: + - Single + fireRate: 0.5 + capacity: 1 + soundEmpty: /Audio/Guns/Empty/empty.ogg + soundGunshot: /Audio/Guns/Gunshots/click.ogg + soundInsert: /Audio/Guns/MagIn/drawbow2.ogg + +- type: entity + name: ToyGunBase + parent: BaseItem + id: ToyGunBase + description: A rooty tooty point and shooty. + abstract: true + components: + - type: Sprite + netsync: false + - type: Icon + +- type: entity + name: cap gun + parent: ToyGunBase + id: RevolverCapGun + description: Looks almost like the real thing! Ages 8 and up. + components: + - type: Sprite + sprite: Objects/Fun/Toys.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - type: Icon + sprite: Objects/Fun/Toys.rsi + state: base + - type: Item + Size: 24 + sprite: Objects/Fun/Toys.rsi + state: base + - type: RangedWeapon + - type: BoltActionBarrel + currentSelector: Single + allSelectors: + - Single + caliber: Cap + capacity: 6 + autoCycle: true + soundGunshot: /Audio/Guns/Gunshots/revolver.ogg + soundEmpty: /Audio/Guns/Empty/empty.ogg + soundInsert: /Audio/Guns/MagIn/revolver_magin.ogg + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D + +- type: entity + name: foamblade + parent: BaseItem + id: FoamBlade + description: It says "Sternside Changs number 1 fan" on it. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: foamblade + - type: Icon + sprite: Objects/Fun/toys.rsi + state: foamblade + - type: MeleeWeapon + range: 2.0 + arcwidth: 0 + arc: spear + - type: Item + Size: 24 + sprite: Objects/Fun/toys.rsi + HeldPrefix: foamblade + - type: ItemCooldown + +# MISC + +- type: entity + name: basketball + parent: BaseItem + id: Basketball + description: Where dah courts at? + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: basketball + - type: Icon + sprite: Objects/Fun/toys.rsi + state: basketball + - type: Item + Size: 24 + sprite: Objects/Fun/toys.rsi + HeldPrefix: bask + +- type: entity + name: syndie balloon + parent: BaseItem + id: BalloonSyn + description: Loud and proud + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: synb + - type: Icon + sprite: Objects/Fun/toys.rsi + state: synb + - type: Item + Size: 24 + sprite: Objects/Fun/toys.rsi + HeldPrefix: synb + +- type: entity + name: corgi balloon + parent: BaseItem + id: BalloonCorgi + description: Cute + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: corgib + - type: Icon + sprite: Objects/Fun/toys.rsi + state: corgib + - type: Item + Size: 24 + sprite: Objects/Fun/toys.rsi + HeldPrefix: corgib diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/boxes.yml new file mode 100644 index 0000000000..5f50fe2fe2 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/boxes.yml @@ -0,0 +1,28 @@ +- type: entity + id: BoxDonkSoftBase + name: "foamdart box" + parent: BaseItem + abstract: true + components: + - type: AmmoBox + caliber: Rocket + capacity: 30 + - type: Icon + - type: Sprite + netsync: false + +# Boxes +- type: entity + id: BoxDonkSoftBox + name: "foamdart box" + parent: BoxDonkSoftBase + components: + - type: AmmoBox + capacity: 40 + fillPrototype: BulletDonkSoft + - type: Icon + sprite: Objects/Fun/toys.rsi + state: foambox + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: foambox diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/cartridges.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/cartridges.yml new file mode 100644 index 0000000000..fe73940524 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/cartridges.yml @@ -0,0 +1,25 @@ +- type: entity + id: CartridgeCapBase + name: cartridge (cap) + parent: BaseItem + abstract: true + components: + - type: Ammo + caliber: Cap + - type: Sprite + netsync: false + directional: true + sprite: Objects/Trash/ash.rsi + state: icon + drawdepth: FloorObjects + - type: Icon + sprite: Objects/Trash/ash.rsi + state: icon + +- type: entity + id: CartridgeCap + name: cartridge (cap) + parent: CartridgeCapBase + components: + - type: Ammo + projectile: BulletCap diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/projectiles.yml new file mode 100644 index 0000000000..4f5a5c3267 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/projectiles.yml @@ -0,0 +1,30 @@ +- type: entity + id: BulletDonkSoftBase + name: foam dart + parent: BaseItem + abstract: true + components: + - type: Projectile + damages: + Brute: 1 + +- type: entity + id: BulletDonkSoft + name: foam dart + parent: BulletDonkSoftBase + description: + components: + - type: Ammo + caliber: Rocket + projectile: BulletFoam + caseless: true + - type: Sprite + netsync: false + sprite: Objects/Fun/toys.rsi + state: foamdart + - type: Icon + sprite: Objects/Fun/toys.rsi + state: foamdart + - type: Projectile + damages: + Brute: 1 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/speedloaders.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/speedloaders.yml new file mode 100644 index 0000000000..6e3cf802f8 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/speedloaders.yml @@ -0,0 +1,36 @@ +- type: entity + id: CapAmmoBase + name: "cap loader" + parent: BaseItem + abstract: true + components: + - type: SpeedLoader + caliber: Cap + capacity: 6 + - type: Icon + state: icon + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-6 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 7 + zeroVisible: false + +- type: entity + id: CapLoader + name: "capgun loader" + parent: CapAmmoBase + components: + - type: SpeedLoader + fillPrototype: CartridgeCap + - type: Icon + sprite: Objects/Fun/caps.rsi + - type: Sprite + sprite: Objects/Fun/caps.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml index 0e89d4e0ad..dfb7b8c3c4 100644 --- a/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml @@ -209,3 +209,32 @@ heavyImpactRange: 5 lightImpactRange: 7 flashRange: 10 + +- type: entity + id: BulletFoam + name: foam dart + parent: BulletBase + abstract: true + components: + - type: Sprite + netsync: false + sprite: Objects/Fun/toys.rsi + state: foamdart + - type: Projectile + deleteOnCollide: true + soundHit: /Audio/Guns/Hits/snap.ogg + damages: + Brute: 2 + +- type: entity + id: BulletCap + name: cap bullet + parent: BulletBase + abstract: true + components: + - type: Sprite + netsync: false + sprite: Objects/Fun/toys.rsi + state: capbullet + - type: Projectile + deleteOnCollide: true diff --git a/Resources/Prototypes/SoundCollections/toy_squeak.yml b/Resources/Prototypes/SoundCollections/toy_squeak.yml new file mode 100644 index 0000000000..06f7a9412e --- /dev/null +++ b/Resources/Prototypes/SoundCollections/toy_squeak.yml @@ -0,0 +1,6 @@ +- type: soundCollection + id: ToySqueak + files: + - /Audio/items/toys/toysqueak1.ogg + - /Audio/items/toys/toysqueak2.ogg + - /Audio/items/toys/toysqueak3.ogg diff --git a/Resources/Textures/Objects/Fun/caps.rsi/base.png b/Resources/Textures/Objects/Fun/caps.rsi/base.png new file mode 100644 index 0000000000..4ba33eff44 Binary files /dev/null and b/Resources/Textures/Objects/Fun/caps.rsi/base.png differ diff --git a/Resources/Textures/Objects/Fun/caps.rsi/icon.png b/Resources/Textures/Objects/Fun/caps.rsi/icon.png new file mode 100644 index 0000000000..6f711170be Binary files /dev/null and b/Resources/Textures/Objects/Fun/caps.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/caps.rsi/mag-1.png b/Resources/Textures/Objects/Fun/caps.rsi/mag-1.png new file mode 100644 index 0000000000..4e2cedab5a Binary files /dev/null and b/Resources/Textures/Objects/Fun/caps.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Fun/caps.rsi/mag-2.png b/Resources/Textures/Objects/Fun/caps.rsi/mag-2.png new file mode 100644 index 0000000000..327c90ce98 Binary files /dev/null and b/Resources/Textures/Objects/Fun/caps.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Fun/caps.rsi/mag-3.png b/Resources/Textures/Objects/Fun/caps.rsi/mag-3.png new file mode 100644 index 0000000000..45ca693766 Binary files /dev/null and b/Resources/Textures/Objects/Fun/caps.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Fun/caps.rsi/mag-4.png b/Resources/Textures/Objects/Fun/caps.rsi/mag-4.png new file mode 100644 index 0000000000..7ae11f951c Binary files /dev/null and b/Resources/Textures/Objects/Fun/caps.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Fun/caps.rsi/mag-5.png b/Resources/Textures/Objects/Fun/caps.rsi/mag-5.png new file mode 100644 index 0000000000..b04960b82b Binary files /dev/null and b/Resources/Textures/Objects/Fun/caps.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Fun/caps.rsi/mag-6.png b/Resources/Textures/Objects/Fun/caps.rsi/mag-6.png new file mode 100644 index 0000000000..267242f239 Binary files /dev/null and b/Resources/Textures/Objects/Fun/caps.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Fun/caps.rsi/meta.json b/Resources/Textures/Objects/Fun/caps.rsi/meta.json new file mode 100644 index 0000000000..100948b512 --- /dev/null +++ b/Resources/Textures/Objects/Fun/caps.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Fun/toys.rsi/AI.png b/Resources/Textures/Objects/Fun/toys.rsi/AI.png new file mode 100644 index 0000000000..7455431785 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/AI.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/base.png b/Resources/Textures/Objects/Fun/toys.rsi/base.png new file mode 100644 index 0000000000..4a17606cbd Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/base.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/bask-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/bask-inhand-left.png new file mode 100644 index 0000000000..409d27b383 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/bask-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/bask-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/bask-inhand-right.png new file mode 100644 index 0000000000..8f8e807704 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/bask-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/basketball.png b/Resources/Textures/Objects/Fun/toys.rsi/basketball.png new file mode 100644 index 0000000000..6b6dd5d1d6 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/basketball.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/bolt-closed.png b/Resources/Textures/Objects/Fun/toys.rsi/bolt-closed.png new file mode 100644 index 0000000000..d6265807f2 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/bolt-open.png b/Resources/Textures/Objects/Fun/toys.rsi/bolt-open.png new file mode 100644 index 0000000000..d8ea8260d0 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/capbullet.png b/Resources/Textures/Objects/Fun/toys.rsi/capbullet.png new file mode 100644 index 0000000000..317f2a973f Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/capbullet.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/capgun-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/capgun-inhand-left.png new file mode 100644 index 0000000000..cfcd235b60 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/capgun-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/capgun-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/capgun-inhand-right.png new file mode 100644 index 0000000000..d272d40c9f Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/capgun-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/carpplush-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/carpplush-inhand-left.png new file mode 100644 index 0000000000..77189f4d7e Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/carpplush-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/carpplush-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/carpplush-inhand-right.png new file mode 100644 index 0000000000..3fd6bdcdd4 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/carpplush-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/carpplush.png b/Resources/Textures/Objects/Fun/toys.rsi/carpplush.png new file mode 100644 index 0000000000..7233feccf0 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/carpplush.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/corgib-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/corgib-inhand-left.png new file mode 100644 index 0000000000..e7b27d9f47 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/corgib-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/corgib-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/corgib-inhand-right.png new file mode 100644 index 0000000000..d57b4da843 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/corgib-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/corgib.png b/Resources/Textures/Objects/Fun/toys.rsi/corgib.png new file mode 100644 index 0000000000..eca7c83852 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/corgib.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/deathripleytoy.png b/Resources/Textures/Objects/Fun/toys.rsi/deathripleytoy.png new file mode 100644 index 0000000000..98c753d0e5 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/deathripleytoy.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/doll-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/doll-inhand-left.png new file mode 100644 index 0000000000..8c50179451 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/doll-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/doll-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/doll-inhand-right.png new file mode 100644 index 0000000000..9f8be24419 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/doll-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/doll.png b/Resources/Textures/Objects/Fun/toys.rsi/doll.png new file mode 100644 index 0000000000..5dcfc8ff94 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/doll.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/durandprize.png b/Resources/Textures/Objects/Fun/toys.rsi/durandprize.png new file mode 100644 index 0000000000..f5da479e78 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/durandprize.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/fireripleytoy.png b/Resources/Textures/Objects/Fun/toys.rsi/fireripleytoy.png new file mode 100644 index 0000000000..b1b7998165 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/fireripleytoy.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/foamblade-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/foamblade-inhand-left.png new file mode 100644 index 0000000000..eb993fadbc Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/foamblade-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/foamblade-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/foamblade-inhand-right.png new file mode 100644 index 0000000000..3f5e5d983d Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/foamblade-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/foamblade.png b/Resources/Textures/Objects/Fun/toys.rsi/foamblade.png new file mode 100644 index 0000000000..7ebd5eda4b Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/foamblade.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/foambox.png b/Resources/Textures/Objects/Fun/toys.rsi/foambox.png new file mode 100644 index 0000000000..495aca3cbc Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/foambox.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/foamcrossbow-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/foamcrossbow-inhand-left.png new file mode 100644 index 0000000000..df7af5c44d Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/foamcrossbow-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/foamcrossbow-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/foamcrossbow-inhand-right.png new file mode 100644 index 0000000000..7ca32199cc Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/foamcrossbow-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/foamcrossbow.png b/Resources/Textures/Objects/Fun/toys.rsi/foamcrossbow.png new file mode 100644 index 0000000000..91965b565b Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/foamcrossbow.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/foamdart.png b/Resources/Textures/Objects/Fun/toys.rsi/foamdart.png new file mode 100644 index 0000000000..3f5d818c2a Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/foamdart.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/griffinprize.png b/Resources/Textures/Objects/Fun/toys.rsi/griffinprize.png new file mode 100644 index 0000000000..c7acbf61c7 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/griffinprize.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/gygaxtoy.png b/Resources/Textures/Objects/Fun/toys.rsi/gygaxtoy.png new file mode 100644 index 0000000000..77e12cb71e Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/gygaxtoy.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/honkprize.png b/Resources/Textures/Objects/Fun/toys.rsi/honkprize.png new file mode 100644 index 0000000000..6bf773e720 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/honkprize.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/ian.png b/Resources/Textures/Objects/Fun/toys.rsi/ian.png new file mode 100644 index 0000000000..0f4457926e Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/ian.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/marauderprize.png b/Resources/Textures/Objects/Fun/toys.rsi/marauderprize.png new file mode 100644 index 0000000000..643939c13e Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/marauderprize.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/maulerprize.png b/Resources/Textures/Objects/Fun/toys.rsi/maulerprize.png new file mode 100644 index 0000000000..845a069793 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/maulerprize.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json new file mode 100644 index 0000000000..0fbc0ff1bd --- /dev/null +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -0,0 +1 @@ +{"version":1,"size":{"x":32,"y":32},"license":"CCBYSA3","copyright":"https://github.com/tgstation/tgstation","states":[{"name":"carpplush","directions":1,"delays":[[1]]},{"name":"narplush","directions":1,"delays":[[1]]},{"name":"plushie_h","directions":1,"delays":[[1]]},{"name":"plushie_lizard","directions":1,"delays":[[1]]},{"name":"plushie_nuke","directions":1,"delays":[[1]]},{"name":"plushie_slime","directions":1,"delays":[[1]]},{"name":"plushie_snake","directions":1,"delays":[[1]]},{"name":"doll","directions":1,"delays":[[1]]},{"name":"carpplush-inhand-left","directions":4,"delays":[[1],[1],[1],[1]]},{"name":"carpplush-inhand-right","directions":4,"delays":[[1],[1],[1],[1]]},{"name":"doll-inhand-left","directions":4,"delays":[[1],[1],[1],[1]]},{"name":"doll-inhand-right","directions":4,"delays":[[1],[1],[1],[1]]},{"name":"AI","directions":1,"delays":[[1]]},{"name":"base","directions":1,"delays":[[1]]},{"name":"bolt-closed","directions":1,"delays":[[1]]},{"name":"bolt-open","directions":1,"delays":[[1]]},{"name":"deathripleytoy","directions":1,"delays":[[1]]},{"name":"durandprize","directions":1,"delays":[[1]]},{"name":"fireripleytoy","directions":1,"delays":[[1]]},{"name":"foamblade","directions":1,"delays":[[1]]},{"name":"foamcrossbow","directions":1,"delays":[[1]]},{"name":"foamdart","directions":1,"delays":[[1]]},{"name":"griffinprize","directions":1,"delays":[[1]]},{"name":"foambox","directions":1,"delays":[[1]]},{"name":"gygaxtoy","directions":1,"delays":[[1]]},{"name":"honkprize","directions":1,"delays":[[1]]},{"name":"ian","directions":1,"delays":[[1]]},{"name":"marauderprize","directions":1,"delays":[[1]]},{"name":"maulerprize","directions":1,"delays":[[1]]},{"name":"nuketoy","directions":1,"delays":[[0.1,0.1]]},{"name":"odysseusprize","directions":1,"delays":[[1]]},{"name":"owlprize","directions":1,"delays":[[1]]},{"name":"phazonprize","directions":1,"delays":[[1]]},{"name":"reticenceprize","directions":1,"delays":[[1]]},{"name":"ripleytoy","directions":1,"delays":[[1]]},{"name":"seraphprize","directions":1,"delays":[[1]]},{"name":"skeletonprize","directions":1,"delays":[[1]]},{"name":"snappop","directions":1,"delays":[[1]]},{"name":"spbox","directions":1,"delays":[[1]]},{"name":"toy_mouse","directions":1,"delays":[[1]]},{"name":"capbullet","directions":1,"delays":[[1]]},{"name":"foamcrossbow-inhand-right","directions":4,"delays":[[1],[1],[1],[1]]},{"name":"foamcrossbow-inhand-left","directions":4,"delays":[[1],[1],[1],[1]]},{"name":"capgun-inhand-right","directions":4,"delays":[[1],[1],[1],[1]]},{"name":"capgun-inhand-right","directions":4,"delays":[[1],[1],[1],[1]]},{"name":"foamblade-inhand-right","directions":4,"delays":[[1],[1],[1],[1]]},{"name":"foamblade-inhand-left","directions":4,"delays":[[1],[1],[1],[1]]},{"name":"corgib-inhand-right","directions":4,"delays":[[1],[1],[1],[1]]},{"name":"corgib-inhand-left","directions":4,"delays":[[1],[1],[1],[1]]},{"name":"synb-inhand-left","directions":4,"delays":[[1],[1],[1],[1]]},{"name":"synb-inhand-right","directions":4,"delays":[[1],[1],[1],[1]]},{"name":"synb","directions":1,"delays":[[1]]},{"name":"corgib","directions":1,"delays":[[1]]},{"name":"basketball","directions":1,"delays":[[1]]},{"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]]}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Fun/toys.rsi/narplush.png b/Resources/Textures/Objects/Fun/toys.rsi/narplush.png new file mode 100644 index 0000000000..083789ed7e Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/narplush.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/nuketoy.png b/Resources/Textures/Objects/Fun/toys.rsi/nuketoy.png new file mode 100644 index 0000000000..dfeb0d0165 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/nuketoy.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/odysseusprize.png b/Resources/Textures/Objects/Fun/toys.rsi/odysseusprize.png new file mode 100644 index 0000000000..bd62b4138d Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/odysseusprize.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/owlprize.png b/Resources/Textures/Objects/Fun/toys.rsi/owlprize.png new file mode 100644 index 0000000000..aab05e030f Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/owlprize.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/phazonprize.png b/Resources/Textures/Objects/Fun/toys.rsi/phazonprize.png new file mode 100644 index 0000000000..58f0850f8c Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/phazonprize.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_h.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_h.png new file mode 100644 index 0000000000..8a37f547a4 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_h.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_lizard.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_lizard.png new file mode 100644 index 0000000000..13b9d21eb4 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_lizard.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_nuke.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_nuke.png new file mode 100644 index 0000000000..d769650fb1 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_nuke.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_slime.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_slime.png new file mode 100644 index 0000000000..452c21326f Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_slime.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_snake.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_snake.png new file mode 100644 index 0000000000..f03f2f2995 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_snake.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/reticenceprize.png b/Resources/Textures/Objects/Fun/toys.rsi/reticenceprize.png new file mode 100644 index 0000000000..fd9d763294 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/reticenceprize.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/ripleytoy.png b/Resources/Textures/Objects/Fun/toys.rsi/ripleytoy.png new file mode 100644 index 0000000000..c35222890f Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/ripleytoy.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/seraphprize.png b/Resources/Textures/Objects/Fun/toys.rsi/seraphprize.png new file mode 100644 index 0000000000..65fe76a9e0 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/seraphprize.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/skeletonprize.png b/Resources/Textures/Objects/Fun/toys.rsi/skeletonprize.png new file mode 100644 index 0000000000..5d8e5f2b94 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/skeletonprize.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/snappop.png b/Resources/Textures/Objects/Fun/toys.rsi/snappop.png new file mode 100644 index 0000000000..a150902cd6 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/snappop.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/spbox.png b/Resources/Textures/Objects/Fun/toys.rsi/spbox.png new file mode 100644 index 0000000000..3cfbf9cd7c Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/spbox.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/synb-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/synb-inhand-left.png new file mode 100644 index 0000000000..389d9cdfe8 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/synb-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/synb-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/synb-inhand-right.png new file mode 100644 index 0000000000..687a959d22 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/synb-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/synb.png b/Resources/Textures/Objects/Fun/toys.rsi/synb.png new file mode 100644 index 0000000000..c960dbb3d1 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/synb.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/toy_mouse.png b/Resources/Textures/Objects/Fun/toys.rsi/toy_mouse.png new file mode 100644 index 0000000000..eb066cbaba Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/toy_mouse.png differ diff --git a/Resources/Textures/Objects/Misc/cablecuffs.rsi/meta.json b/Resources/Textures/Objects/Misc/cablecuffs.rsi/meta.json index 62cee9e339..2129ef9e34 100644 --- a/Resources/Textures/Objects/Misc/cablecuffs.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/cablecuffs.rsi/meta.json @@ -1 +1,54 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "cuff", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cuff", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/helpme.png b/Resources/Textures/Objects/Misc/carvings.rsi/helpme.png new file mode 100644 index 0000000000..37435f1261 Binary files /dev/null and b/Resources/Textures/Objects/Misc/carvings.rsi/helpme.png differ diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/carvings.rsi/inhand-left.png new file mode 100644 index 0000000000..366b63535e Binary files /dev/null and b/Resources/Textures/Objects/Misc/carvings.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/carvings.rsi/inhand-right.png new file mode 100644 index 0000000000..1ac763ed26 Binary files /dev/null and b/Resources/Textures/Objects/Misc/carvings.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/meta.json b/Resources/Textures/Objects/Misc/carvings.rsi/meta.json new file mode 100644 index 0000000000..d7591dcb4e --- /dev/null +++ b/Resources/Textures/Objects/Misc/carvings.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "", + "copyright": "By Bright", + "states": [ + { + "name": "helpme", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Trash/ash.rsi/icon.png b/Resources/Textures/Objects/Trash/ash.rsi/icon.png new file mode 100644 index 0000000000..94b4030c60 Binary files /dev/null and b/Resources/Textures/Objects/Trash/ash.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Trash/ash.rsi/meta.json b/Resources/Textures/Objects/Trash/ash.rsi/meta.json new file mode 100644 index 0000000000..1832695588 --- /dev/null +++ b/Resources/Textures/Objects/Trash/ash.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon", "directions": 1}]} \ No newline at end of file