diff --git a/Resources/Audio/Effects/silence.ogg b/Resources/Audio/Effects/silence.ogg new file mode 100644 index 0000000000..9173810848 Binary files /dev/null and b/Resources/Audio/Effects/silence.ogg differ diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index 61085f13b9..68bb4a6b84 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml @@ -88,26 +88,6 @@ category: cargoproduct-category-name-fun group: market -- type: cargoProduct - id: FunPlushies - icon: - sprite: Objects/Fun/toys.rsi - state: plushie_h - product: CrateFunPlushie - cost: 1000 - category: cargoproduct-category-name-fun - group: market - -- type: cargoProduct - id: FunLizardPlushies - icon: - sprite: Objects/Fun/toys.rsi - state: plushie_lizard - product: CrateFunLizardPlushieBulk - cost: 500 - category: cargoproduct-category-name-fun - group: market - - type: cargoProduct id: FunBoardGames icon: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 4d34fa4290..e616aefba2 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -40,35 +40,7 @@ - id: PlushieArachind - id: PlushiePenguin -- type: entity - id: CrateFunPlushie - parent: CrateGenericSteel - name: plushie crate - description: A buncha soft plushies. Throw them around and then wonder how you're gonna explain this purchase to NT. - components: - - type: EntityTableContainerFill - containers: - entity_storage: !type:NestedSelector - tableId: AllPlushiesTable - rolls: !type:ConstantNumberSelector - value: 10 - -- type: entity - id: CrateFunLizardPlushieBulk - parent: CrateGenericSteel - name: bulk lizard plushie crate - description: A buncha soft lizard plushies. Throw them around and then wonder how you're gonna explain this purchase to NT. - components: - - type: EntityTableContainerFill - containers: - entity_storage: !type:AllSelector - children: - - id: PlushieLizard - amount: !type:ConstantNumberSelector - value: 3 - - id: PlushieSpaceLizard - amount: !type:ConstantNumberSelector - value: 3 +# Removed crates with toys because EE toys - type: entity id: CrateFunInstrumentsVariety diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index 48e8b1a178..c831476b90 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -12,6 +12,7 @@ rarePrototypes: - FoamBlade - PlushieGhost + - PlushieAbductorAgent rareChance: 0.03 prototypes: - PlushieBee @@ -34,6 +35,38 @@ - ToyMouse - PlushieDiona - PlushieArachind + - PlushieArachne # EE toys START + - PlushieAbductor + - PlushieGnome + - PlushieLoveable + - PlushieDeer + - PlushieIpc + - PlushieGrey + - PlushieRedFox + - PlushiePurpleFox + - PlushiePinkFox + - PlushieOrangeFox + - PlushieMarbleFox + - PlushieCrimsonFox + - PlushieCoffeeFox + - PlushieBlueFox + - PlushieBlackFox + - PlushieVulp + - PlushieCorgi + - PlushieGirlyCorgi + - PlushieRobotCorgi + - PlushieCatBlack + - PlushieCatGrey + - PlushieCatOrange + - PlushieCatSiames + - PlushieCatTabby + - PlushieCatTuxedo + - PlushieCatWhite + - PlushieRatvar + - PlushieNar + - PlushieTrystan + - PlushieSlips + - PlushieJester # EE toys END chance: 0.5 offset: 0.2 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml index d55a7916b4..50188bfdf8 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml @@ -31,4 +31,5 @@ - VendingMachineSoda - VendingMachineStarkist - VendingMachineSpaceUp + - PrizeCounter # Ataraxia chance: 1 diff --git a/Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml b/Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml new file mode 100644 index 0000000000..695e45a2e6 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml @@ -0,0 +1,395 @@ +- type: entity + abstract: true + parent: BaseItem + id: PrizeTicketBase + description: A prize ticket, ready to be redeemed at a prize counter. + components: + - type: Sprite + sprite: Objects/Fun/prizeticket.rsi + - type: Item + sprite: Objects/Fun/prizeticket.rsi + size: Tiny + - type: StaticPrice + price: 0 + - type: Tag + tags: + - Sheet + - PrizeTicket + +- type: entity + parent: PrizeTicketBase + id: PrizeTicket + name: prize ticket + suffix: Full + components: + - type: Material + - type: PhysicalComposition + materialComposition: + PrizeTicket: 1 + - type: Stack + count: 100 + stackType: PrizeTicket + baseLayer: base + layerStates: + - ticket + - ticket_2 + - ticket_3 + - ticket_4 + - type: Sprite + state: ticket_4 + layers: + - state: ticket_4 + map: ["base"] + - type: Item + heldPrefix: prize ticket + - type: Appearance + +- type: entity + parent: PrizeTicket + id: PrizeTicket10 + name: prize ticket + suffix: 10 + components: + - type: Sprite + state: ticket + - type: Stack + stackType: PrizeTicket + count: 10 + +- type: entity + parent: PrizeTicket + id: PrizeTicket30 + name: prize ticket + suffix: 30 + components: + - type: Sprite + state: ticket + - type: Stack + stackType: PrizeTicket + count: 30 + +- type: entity + parent: PrizeTicket + id: PrizeTicket60 + name: prize ticket + suffix: 60 + components: + - type: Sprite + state: ticket + - type: Stack + stackType: PrizeTicket + count: 60 + +- type: entity + parent: PrizeTicket + id: PrizeTicket1 + name: prize ticket + suffix: Single + components: + - type: Sprite + state: ticket + - type: Stack + stackType: PrizeTicket + count: 1 + +- type: entity + parent: PresentRandom + id: PrizeBall + name: prize ball + description: I wounder whats inside! + components: + - type: Sprite + sprite: Objects/Fun/prizeticket.rsi + layers: + - state: prizeball + - type: SpawnItemsOnUse + items: + - id: PresentTrash + - id: PrizeTicket10 + orGroup: Prize + # Common + - id: PrizeTicket30 + prob: 0.80 + orGroup: Prize + - id: PlushieMothRandom + prob: 0.80 + orGroup: Prize + - id: PlushieMothMusician + prob: 0.80 + orGroup: Prize + - id: PlushieMothBartender + prob: 0.80 + orGroup: Prize + - id: PlushieBee + prob: 0.80 + orGroup: Prize + - id: PlushieHampter + prob: 0.80 + orGroup: Prize + - id: PlushieRouny + prob: 0.80 + orGroup: Prize + - id: PlushieLamp + prob: 0.80 + orGroup: Prize + - id: PlushieArachind + prob: 0.80 + orGroup: Prize + - id: PlushieLizard + prob: 0.80 + orGroup: Prize + - id: PlushieLizardMirrored + prob: 0.80 + orGroup: Prize + - id: PlushieSpaceLizard + prob: 0.80 + orGroup: Prize + - id: PlushieDiona + prob: 0.80 + orGroup: Prize + - id: PlushieSharkBlue + prob: 0.80 + orGroup: Prize + - id: PlushieSharkPink + prob: 0.80 + orGroup: Prize + - id: PlushieSharkGrey + prob: 0.80 + orGroup: Prize + - id: PlushieCarp + prob: 0.80 + orGroup: Prize + - id: PlushieMagicarp + prob: 0.80 + orGroup: Prize + - id: PlushieHolocarp + prob: 0.80 + orGroup: Prize + - id: PlushieSlime + prob: 0.80 + orGroup: Prize + - id: PlushieSnake + prob: 0.80 + orGroup: Prize + - id: ToyMouse + prob: 0.80 + orGroup: Prize + - id: ToyRubberDuck + prob: 0.80 + orGroup: Prize + - id: PlushieVox + prob: 0.80 + orGroup: Prize + - id: PlushieAtmosian + prob: 0.80 + orGroup: Prize + - id: PlushiePenguin + prob: 0.80 + orGroup: Prize + - id: PlushieHuman + prob: 0.80 + orGroup: Prize + - id: PlushieArachne + prob: 0.80 + orGroup: Prize + - id: PlushieGnome + prob: 0.80 + orGroup: Prize + - id: PlushieLoveable + prob: 0.80 + orGroup: Prize + - id: PlushieDeer + prob: 0.80 + orGroup: Prize + - id: PlushieIpc + prob: 0.80 + orGroup: Prize + - id: PlushieGrey + prob: 0.80 + orGroup: Prize + - id: PlushieRedFox + prob: 0.80 + orGroup: Prize + - id: PlushiePurpleFox + prob: 0.80 + orGroup: Prize + - id: PlushiePinkFox + prob: 0.80 + orGroup: Prize + - id: PlushieOrangeFox + prob: 0.80 + orGroup: Prize + - id: PlushieMarbleFox + prob: 0.80 + orGroup: Prize + - id: PlushieCrimsonFox + prob: 0.80 + orGroup: Prize + - id: PlushieCoffeeFox + prob: 0.80 + orGroup: Prize + - id: PlushieBlueFox + prob: 0.80 + orGroup: Prize + - id: PlushieBlackFox + prob: 0.80 + orGroup: Prize + - id: PlushieVulp + prob: 0.80 + orGroup: Prize + - id: PlushieCorgi + prob: 0.80 + orGroup: Prize + - id: PlushieGirlyCorgi + prob: 0.80 + orGroup: Prize + - id: PlushieRobotCorgi + prob: 0.80 + orGroup: Prize + - id: PlushieCatBlack + prob: 0.80 + orGroup: Prize + - id: PlushieCatGrey + prob: 0.80 + orGroup: Prize + - id: PlushieCatOrange + prob: 0.80 + orGroup: Prize + - id: PlushieCatSiames + prob: 0.80 + orGroup: Prize + - id: PlushieCatTabby + prob: 0.80 + orGroup: Prize + - id: PlushieCatTuxedo + prob: 0.80 + orGroup: Prize + - id: PlushieCatWhite + prob: 0.80 + orGroup: Prize + - id: ToyAi + prob: 0.80 + orGroup: Prize + - id: ToyIan + prob: 0.80 + orGroup: Prize + - id: BalloonNT + prob: 0.80 + orGroup: Prize + - id: BalloonCorgi + prob: 0.80 + orGroup: Prize + - id: CrayonBox + prob: 0.80 + orGroup: Prize + - id: BasePetRock + prob: 0.80 + orGroup: Prize + # Uncommon + - id: PrizeTicket60 + prob: 0.50 + orGroup: Prize + - id: PlushieGhost + prob: 0.50 + orGroup: Prize + - id: PlushieRGBee + prob: 0.50 + orGroup: Prize + - id: PlushieRatvar + prob: 0.50 + orGroup: Prize + - id: PlushieNar + prob: 0.50 + orGroup: Prize + - id: PlushieRainbowCarp + prob: 0.50 + orGroup: Prize + - id: PlushieXeno + prob: 0.50 + orGroup: Prize + - id: PlushieJester + prob: 0.50 + orGroup: Prize + - id: PlushieSlips + prob: 0.50 + orGroup: Prize + - id: PlushieAbductor + prob: 0.50 + orGroup: Prize + - id: PlushieTrystan + prob: 0.50 + orGroup: Prize + - id: FoamCrossbow + prob: 0.50 + orGroup: Prize + - id: RevolverCapGun + prob: 0.50 + orGroup: Prize + - id: PonderingOrb + prob: 0.50 + orGroup: Prize + - id: ToyAmongPequeno + prob: 0.50 + orGroup: Prize + - id: FoamCutlass + prob: 0.50 + orGroup: Prize + - id: ToyHammer + prob: 0.50 + orGroup: Prize + - id: WhoopieCushion + prob: 0.50 + orGroup: Prize + - id: PlasticBanana + prob: 0.50 + orGroup: Prize + - id: WeaponWaterPistol + prob: 0.50 + orGroup: Prize + - id: WeaponWaterBlaster + prob: 0.50 + orGroup: Prize + - id: NewtonCradle + prob: 0.50 + orGroup: Prize + - id: SnapPopBox + prob: 0.50 + orGroup: Prize + - id: CrazyGlue + prob: 0.50 + orGroup: Prize + - id: MrChips + prob: 0.50 + orGroup: Prize + - id: MrDips + prob: 0.50 + orGroup: Prize + # Rare + - id: PlushieAbductorAgent + prob: 0.30 + orGroup: Prize + - id: PlushieNuke + prob: 0.30 + orGroup: Prize + - id: ToyNuke + prob: 0.30 + orGroup: Prize + - id: FoamBlade + prob: 0.30 + orGroup: Prize + - id: BalloonSyn + prob: 0.30 + orGroup: Prize + - id: SingularityToy + prob: 0.30 + orGroup: Prize + - id: TeslaToy + prob: 0.30 + orGroup: Prize + - id: ToySword + prob: 0.30 + orGroup: Prize + - id: ThronglerToy + prob: 0.30 + orGroup: Prize + \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Fun/puppet.yml b/Resources/Prototypes/Entities/Objects/Fun/puppet.yml index 01a15d2e5b..068039e0c5 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/puppet.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/puppet.yml @@ -40,3 +40,92 @@ sprite: Objects/Fun/mrdips.rsi layers: - state: icon + +## PET ROCK! + +- type: entity + id: PetRockCarrier + parent: HappyHonk + name: pet rock carrier + description: Your new and only best friend home! + components: + - type: Sprite + sprite: Objects/Storage/Happyhonk/rock_carrier.rsi + state: box + - type: Item + sprite: Objects/Storage/Happyhonk/rock_carrier.rsi + heldPrefix: box + - type: StorageFill + contents: + - id: PetRock + prob: 0.8 + orGroup: Rock + - id: PetRockFred + prob: 0.1 + orGroup: Rock + - id: PetRockRoxie + prob: 0.1 + orGroup: Rock + +- type: entity + parent: [BaseItem, MrChips] + id: BasePetRock + name: pet rock + description: Your new and only best friend! + abstract: true + components: + - type: DamageOnLand + damage: + types: + Blunt: 1 + - type: DamageOtherOnHit + damage: + types: + Blunt: 1 + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + - !type:SpawnEntitiesBehavior + spawn: + Ash: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + parent: BasePetRock + id: PetRock + components: + - type: Sprite + sprite: Objects/Fun/petrock.rsi + layers: + - state: rock + +- type: entity + parent: BasePetRock + id: PetRockFred + name: fred + components: + - type: Sprite + sprite: Objects/Fun/petrock.rsi + layers: + - state: fred + +- type: entity + parent: BasePetRock + id: PetRockRoxie + name: roxie + components: + - type: Sprite + sprite: Objects/Fun/petrock.rsi + layers: + - state: roxie \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 6ac158630f..493dc3ab3d 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -796,6 +796,34 @@ sound: path: /Audio/Voice/Human/malescream_5.ogg +- type: entity + parent: BasePlushie + id: PlushieArachne + name: Arachne plushie + description: A plushie of an Arachne, a half human, half spider creature. Why does it look familiar? + components: + - type: Sprite + state: plushie_arachne + - type: EmitSoundOnUse + sound: + path: /Audio/Voice/Human/womanlaugh.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Voice/Human/female_sigh.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Voice/Human/womanlaugh.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Voice/Human/femalescream_4.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/Voice/Human/femalescream_2.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Voice/Human/femalescream_5.ogg + - type: entity parent: BasePlushie id: PlushieMoth @@ -824,6 +852,368 @@ useSound: path: /Audio/Voice/Moth/moth_chitter.ogg +- type: entity + parent: BasePlushie + id: PlushieJester #Weh! + name: jester plushie + description: A dubious little creature getting up to mischief. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: plushie_jester + +- type: entity + parent: BasePlushie + id: PlushieSlips + name: janitor plushie + description: The silent cleaner, the one that you dont hear say "Weh"! + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: plushie_slips + - type: EmitSoundOnUse + sound: + path: /Audio/Effects/silence.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Effects/silence.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Effects/silence.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/Effects/silence.ogg + - type: Tag + tags: + - Soap + - type: Slippery + paralyzeTime: 0.7 + launchForwardsMultiplier: 0.5 + - type: StepTrigger + intersectRatio: 0.2 + - type: CollisionWake + enabled: false + - type: Physics + bodyType: Dynamic + - type: Fixtures + fixtures: + slips: + shape: + !type:PhysShapeAabb + bounds: "-0.4,-0.3,0.4,0.3" + layer: + - SlipLayer + hard: false + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.4,-0.3,0.4,0.3" + density: 10 + mask: + - ItemMask + +- type: entity + parent: BasePlushie + id: PlushieGnome + name: gnome plushie + description: A stuffed toy that resembles a gnome! or a drawf... + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: gnome + +- type: entity + parent: BasePlushie + id: PlushieLoveable + name: loveable plushie + description: A stuffed toy that resembles... a creature. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: loveable + +- type: entity + parent: BasePlushie + id: PlushieDeer + name: deer plushie + description: A stuffed toy that resembles a deer! + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: deer + +- type: entity + parent: BasePlushie + id: PlushieIpc + name: ipc plushie + description: A stuffed toy that resembles a ipc! + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: ipc + +- type: entity + parent: BasePlushie + id: PlushieGrey + name: grey plushie + description: A stuffed toy that resembles a grey! + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: grey + +- type: entity + parent: BasePlushie + id: PlushieAbductor + name: abductor plushie + description: A stuffed toy that resembles an abductor! + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: abductor + +- type: entity + parent: BasePlushie + id: PlushieAbductorAgent + name: abductor agent plushie + description: A stuffed toy that resembles an abductor agent! + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: abductor_agent + +- type: entity + parent: BasePlushie + id: PlushieRedFox + name: red fox plushie + description: A cute plushie that look like a red foxxo! + components: + - type: Sprite + sprite: Objects/Fun/foxplushie.rsi + state: red + +- type: entity + parent: BasePlushie + id: PlushiePurpleFox + name: purple fox plushie + description: A cute plushie that look like a purple foxxo! + components: + - type: Sprite + sprite: Objects/Fun/foxplushie.rsi + state: purple + +- type: entity + parent: BasePlushie + id: PlushiePinkFox + name: pink fox plushie + description: A cute plushie that look like a pink foxxo! + components: + - type: Sprite + sprite: Objects/Fun/foxplushie.rsi + state: pink + +- type: entity + parent: BasePlushie + id: PlushieOrangeFox + name: orange fox plushie + description: A cute plushie that look like a orange foxxo! + components: + - type: Sprite + sprite: Objects/Fun/foxplushie.rsi + state: orange + +- type: entity + parent: BasePlushie + id: PlushieMarbleFox + name: marble fox plushie + description: A cute plushie that look like a marble foxxo! + components: + - type: Sprite + sprite: Objects/Fun/foxplushie.rsi + state: marble + +- type: entity + parent: BasePlushie + id: PlushieCrimsonFox + name: crimson fox plushie + description: A cute plushie that look like a crimson foxxo! + components: + - type: Sprite + sprite: Objects/Fun/foxplushie.rsi + state: crimson + +- type: entity + parent: BasePlushie + id: PlushieCoffeeFox + name: coffee fox plushie + description: A cute plushie that look like a coffee foxxo! + components: + - type: Sprite + sprite: Objects/Fun/foxplushie.rsi + state: coffee + +- type: entity + parent: BasePlushie + id: PlushieBlueFox + name: blue fox plushie + description: A cute plushie that look like a blue foxxo! + components: + - type: Sprite + sprite: Objects/Fun/foxplushie.rsi + state: blue + +- type: entity + parent: BasePlushie + id: PlushieBlackFox + name: black fox plushie + description: A cute plushie that look like a black foxxo! + components: + - type: Sprite + sprite: Objects/Fun/foxplushie.rsi + state: black + +- type: entity + parent: BasePlushie + id: PlushieVulp + name: vulpkanin plushie + description: A vulpkanin plushie, at least you can hug this one without the risk to get bitten. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: plushie_vulp + - type: EmitSoundOnUse + sound: + path: /Audio/DeltaV/Voice/Vulpkanin/dog_bark1.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/DeltaV/Voice/Vulpkanin/dog_bark1.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/DeltaV/Voice/Vulpkanin/dog_bark1.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/DeltaV/Voice/Vulpkanin/dog_bark1.ogg + +- type: entity + parent: PlushieVulp + id: PlushieTrystan + name: office vulp plushie + description: The ones who yeeps! + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: plushie_trystan + +- type: entity + parent: PlushieVulp + id: PlushieCorgi + name: corgi plushie + description: The ian plushie edition! + components: + - type: Sprite + sprite: Objects/Fun/corgiplushie.rsi + state: corgi + +- type: entity + parent: PlushieVulp + id: PlushieGirlyCorgi + name: girly corgi plushie + components: + - type: Sprite + sprite: Objects/Fun/corgiplushie.rsi + state: girlycorgi + +- type: entity + parent: PlushieVulp + id: PlushieRobotCorgi + name: robot corgi plushie + components: + - type: Sprite + sprite: Objects/Fun/corgiplushie.rsi + state: robotcorgi + +- type: entity + parent: BasePlushie + id: BasePlushieCat + description: A stuffed toy that resembles a cute kitty! + abstract: true + components: + - type: EmitSoundOnUse + sound: + path: /Audio/Nyanotrasen/Voice/Felinid/cat_meow1.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Nyanotrasen/Voice/Felinid/cat_meow1.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Nyanotrasen/Voice/Felinid/cat_meow1.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/Nyanotrasen/Voice/Felinid/cat_meow1.ogg + +- type: entity + parent: BasePlushieCat + id: PlushieCatBlack + name: black cat plushie + components: + - type: Sprite + sprite: Objects/Fun/catplushie.rsi + state: black + +- type: entity + parent: BasePlushieCat + id: PlushieCatGrey + name: grey cat plushie + components: + - type: Sprite + sprite: Objects/Fun/catplushie.rsi + state: grey + +- type: entity + parent: BasePlushieCat + id: PlushieCatOrange + name: orange cat plushie + components: + - type: Sprite + sprite: Objects/Fun/catplushie.rsi + state: orange + +- type: entity + parent: BasePlushieCat + id: PlushieCatSiames + name: siames cat plushie + components: + - type: Sprite + sprite: Objects/Fun/catplushie.rsi + state: siames + +- type: entity + parent: BasePlushieCat + id: PlushieCatTabby + name: tabby cat plushie + components: + - type: Sprite + sprite: Objects/Fun/catplushie.rsi + state: tabby + +- type: entity + parent: BasePlushieCat + id: PlushieCatTuxedo + name: tuxedo cat plushie + components: + - type: Sprite + sprite: Objects/Fun/catplushie.rsi + state: tuxedo + +- type: entity + parent: BasePlushieCat + id: PlushieCatWhite + name: white cat plushie + components: + - type: Sprite + sprite: Objects/Fun/catplushie.rsi + state: white + ## Cheapo Figurines - type: entity @@ -1545,3 +1935,31 @@ params: volume: -9 maxDistance: 3 + +- type: entity + name: The Throngler + parent: ToyHammer + id: ThronglerToy + suffix: Toy + description: Why would you make this? + components: + - type: Sprite + sprite: Objects/Weapons/Melee/Throngler2.rsi + state: icon + - type: StaminaDamageOnHit + damage: 0.8 + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 10 + damage: + types: + Blunt: 0 + soundHit: + path: /Audio/Effects/explosion_small1.ogg + soundNoDamage: + path: /Audio/Effects/explosion_small1.ogg + - type: Item + size: Ginormous + sprite: Objects/Weapons/Melee/Throngler-in-hand.rsi + - type: DisarmMalus + malus: 0 diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml index 8b2cb5d5c7..3fb87094c6 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml @@ -71,65 +71,16 @@ - type: SpaceVillainArcade rewardMinAmount: 0 rewardMaxAmount: 0 - possibleRewards: - - ToyMouse - - ToyAi - - ToyNuke - - ToyGriffin - - ToyHonk - - ToyIan - - ToyMarauder - - ToyMauler - - ToyGygax - - ToyOdysseus - - ToyOwlman - - ToyDeathRipley - - ToyPhazon - - ToyFireRipley - - ToyReticence - - ToyRipley - - ToySeraph - - ToyDurand - - ToySkeleton - - FoamCrossbow - - RevolverCapGun - - PlushieHampter - - PlushieLizard - - PlushieAtmosian - - PlushieSpaceLizard - - PlushieNuke - - PlushieCarp - - PlushieMagicarp - - PlushieHolocarp - - PlushieRainbowCarp - - PlushieRatvar - - PlushieNar - - PlushieSnake - - PlushieArachind - - Basketball - - Football - - PlushieRouny - - PlushieBee - - PlushieSlime - - BalloonNT - - BalloonCorgi - - ToySword - - CrayonBox - - BoxDonkSoftBox - - BoxCartridgeCap - - HarmonicaInstrument - - OcarinaInstrument - - RecorderInstrument - - GunpetInstrument - - BirdToyInstrument - - PlushieXeno - - BeachBall - - PlushieMoth - - PlushieHampter - - PlushiePenguin - - PlushieHuman - - ClothingHeadHatCowboyRed - - Whistle + possibleRewards: # EE toys EDIT + - PrizeBall + - PrizeTicket10 + - PrizeTicket10 + - PrizeTicket10 + - PrizeTicket10 + - PrizeTicket10 + - PrizeTicket30 + - PrizeTicket30 + - PrizeTicket60 - type: WiresPanel - type: Wires layoutId: Arcade diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index c606e26f8f..40ad2c4daa 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1330,3 +1330,138 @@ - Wooden - RawMaterial - Plastic + +- type: entity + parent: BaseLathe + id: PrizeCounter + name: prize counter + description: Claim your prize and win some toys and cute plushies! + components: + - type: AmbientOnPowered + - type: AmbientSound + volume: -9 + range: 3 + enabled: false + sound: + path: /Audio/Ambience/Objects/vending_machine_hum.ogg + - type: LitOnPowered + - type: ApcPowerReceiver + powerLoad: 200 + priority: Low + # - type: Advertise + # pack: CuddlyCritterAds # TODO Change this + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#4b93ad" + - type: Transform + noRot: false + - type: Sprite + sprite: Structures/Machines/prizecounter.rsi + snapCardinals: true + layers: + - state: icon + map: ["enum.LatheVisualLayers.IsRunning"] + - state: unlit + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Lathe + idleState: icon + runningState: icon + staticRecipes: + - PrizeBall + - PlushieBee + - PlushieHampter + - PlushieRouny + - PlushieLamp + - PlushieArachind + - PlushieLizard + - PlushieSpaceLizard + - PlushieSharkBlue + - PlushieSharkPink + - PlushieSharkGrey + - PlushieCarp + - PlushieMagicarp + - PlushieHolocarp + - PlushieSlime + - PlushieSnake + - ToyMouse + - ToyRubberDuck + - PlushieVox + - PlushieAtmosian + - PlushiePenguin + - PlushieHuman + - PlushieArachne + - PlushieGnome + - PlushieLoveable + - PlushieDeer + - PlushieIpc + - PlushieGrey + - PlushieRedFox + - PlushiePurpleFox + - PlushiePinkFox + - PlushieOrangeFox + - PlushieMarbleFox + - PlushieCrimsonFox + - PlushieCoffeeFox + - PlushieBlueFox + - PlushieBlackFox + - PlushieVulp + - PlushieCorgi + - PlushieGirlyCorgi + - PlushieRobotCorgi + - PlushieCatBlack + - PlushieCatGrey + - PlushieCatOrange + - PlushieCatSiames + - PlushieCatTabby + - PlushieCatTuxedo + - PlushieCatWhite + - ToyAi + - ToyIan + - BalloonNT + - BalloonCorgi + - CrayonBox + - PetRockCarrier + - PlushieXeno + - FoamCrossbow + - RevolverCapGun + - PonderingOrb + - ToyAmongPequeno + - FoamCutlass + - WhoopieCushion + - ToyHammer + - PlasticBanana + - WeaponWaterPistol + - WeaponWaterBlaster + - NewtonCradle + - SnapPopBox + - MrDips + - MrChips + - CrazyGlue + - PlushieRatvar + - PlushieNar + - type: EmagLatheRecipes + emagStaticRecipes: + - PlushieGhost + - PlushieRGBee + - PlushieRainbowCarp + - PlushieJester + - PlushieSlips + - PlushieTrystan + - PlushieAbductor + - PlushieAbductorAgent + - PlushieNuke + - ToyNuke + - FoamBlade + - BalloonSyn + - SingularityToy + - TeslaToy + - ToySword + - ThronglerToy + - type: MaterialStorage + whitelist: + tags: + - PrizeTicket diff --git a/Resources/Prototypes/Reagents/Materials/prizeticket.yml b/Resources/Prototypes/Reagents/Materials/prizeticket.yml new file mode 100644 index 0000000000..cde81626c8 --- /dev/null +++ b/Resources/Prototypes/Reagents/Materials/prizeticket.yml @@ -0,0 +1,6 @@ +- type: material + id: PrizeTicket + stackEntity: PrizeTicket1 + name: prize ticket + icon: { sprite: Objects/Fun/prizeticket.rsi, state: ticket } + price: 0 diff --git a/Resources/Prototypes/Recipes/Lathes/prizecounter.yml b/Resources/Prototypes/Recipes/Lathes/prizecounter.yml new file mode 100644 index 0000000000..e893c17835 --- /dev/null +++ b/Resources/Prototypes/Recipes/Lathes/prizecounter.yml @@ -0,0 +1,729 @@ +- type: latheRecipe + id: PrizeBall + result: PrizeBall + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 30 + +- type: latheRecipe + id: PlushieMothRandom + result: PlushieMothRandom + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieMothMusician + result: PlushieMothMusician + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieMothBartender + result: PlushieMothBartender + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieBee + result: PlushieBee + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieHampter + result: PlushieHampter + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieRouny + result: PlushieRouny + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieLamp + result: PlushieLamp + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieArachind + result: PlushieArachind + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieLizard + result: PlushieLizard + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieSpaceLizard + result: PlushieSpaceLizard + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieSharkBlue + result: PlushieSharkBlue + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieSharkPink + result: PlushieSharkPink + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieSharkGrey + result: PlushieSharkGrey + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieCarp + result: PlushieCarp + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieMagicarp + result: PlushieMagicarp + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieHolocarp + result: PlushieHolocarp + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieSlime + result: PlushieSlime + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieSnake + result: PlushieSnake + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: ToyMouse + result: ToyMouse + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: ToyRubberDuck + result: ToyRubberDuck + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieVox + result: PlushieVox + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieAtmosian + result: PlushieAtmosian + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushiePenguin + result: PlushiePenguin + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieHuman + result: PlushieHuman + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieArachne + result: PlushieArachne + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieGnome + result: PlushieGnome + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieLoveable + result: PlushieLoveable + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieDeer + result: PlushieDeer + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieIpc + result: PlushieIpc + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieGrey + result: PlushieGrey + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieRedFox + result: PlushieRedFox + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushiePurpleFox + result: PlushiePurpleFox + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushiePinkFox + result: PlushiePinkFox + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieOrangeFox + result: PlushieOrangeFox + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieMarbleFox + result: PlushieMarbleFox + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieCrimsonFox + result: PlushieCrimsonFox + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieCoffeeFox + result: PlushieCoffeeFox + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieBlueFox + result: PlushieBlueFox + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieBlackFox + result: PlushieBlackFox + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieVulp + result: PlushieVulp + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieCorgi + result: PlushieCorgi + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieGirlyCorgi + result: PlushieGirlyCorgi + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieRobotCorgi + result: PlushieRobotCorgi + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieCatBlack + result: PlushieCatBlack + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieCatGrey + result: PlushieCatGrey + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieCatOrange + result: PlushieCatOrange + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieCatSiames + result: PlushieCatSiames + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieCatTabby + result: PlushieCatTabby + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieCatTuxedo + result: PlushieCatTuxedo + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieCatWhite + result: PlushieCatWhite + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: ToyAi + result: ToyAi + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 30 + +- type: latheRecipe + id: ToyIan + result: ToyIan + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 30 + +- type: latheRecipe + id: BalloonNT + result: BalloonNT + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 30 + +- type: latheRecipe + id: BalloonCorgi + result: BalloonCorgi + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 30 + +- type: latheRecipe + id: CrayonBox + result: CrayonBox + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 20 + +- type: latheRecipe + id: PetRockCarrier + result: PetRockCarrier + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 50 + +- type: latheRecipe + id: PlushieXeno + result: PlushieXeno + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 80 + +- type: latheRecipe + id: FoamCrossbow + result: FoamCrossbow + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: RevolverCapGun + result: RevolverCapGun + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: PonderingOrb + result: PonderingOrb + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 80 + +- type: latheRecipe + id: ToyAmongPequeno + result: ToyAmongPequeno + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 80 + +- type: latheRecipe + id: FoamCutlass + result: FoamCutlass + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: ToyHammer + result: ToyHammer + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: WhoopieCushion + result: WhoopieCushion + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: PlasticBanana + result: PlasticBanana + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 80 + +- type: latheRecipe + id: WeaponWaterPistol + result: WeaponWaterPistol + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: WeaponWaterBlaster + result: WeaponWaterBlaster + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: NewtonCradle + result: NewtonCradle + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 80 + +- type: latheRecipe + id: SnapPopBox + result: SnapPopBox + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 80 + +- type: latheRecipe + id: MrDips + result: MrDips + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 80 + +- type: latheRecipe + id: MrChips + result: MrChips + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 80 + +- type: latheRecipe + id: CrazyGlue + result: CrazyGlue + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: PlushieRatvar + result: PlushieRatvar + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 80 + +- type: latheRecipe + id: PlushieNar + result: PlushieNar + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 80 + +# EMAG + +- type: latheRecipe + id: PlushieGhost + result: PlushieGhost + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: PlushieRGBee + result: PlushieRGBee + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: PlushieRainbowCarp + result: PlushieRainbowCarp + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: PlushieJester + result: PlushieJester + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: PlushieSlips + result: PlushieSlips + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: PlushieTrystan + result: PlushieTrystan + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: PlushieAbductor + result: PlushieAbductor + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: PlushieAbductorAgent + result: PlushieAbductorAgent + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: PlushieNuke + result: PlushieNuke + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: ToyNuke + result: ToyNuke + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: FoamBlade + result: FoamBlade + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 150 + +- type: latheRecipe + id: BalloonSyn + result: BalloonSyn + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 100 + +- type: latheRecipe + id: SingularityToy + result: SingularityToy + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 150 + +- type: latheRecipe + id: TeslaToy + result: TeslaToy + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 150 + +- type: latheRecipe + id: ToySword + result: ToySword + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 200 + +- type: latheRecipe + id: ThronglerToy + result: ThronglerToy + applyMaterialDiscount: false + completetime: 0.1 + materials: + PrizeTicket: 500 \ No newline at end of file diff --git a/Resources/Prototypes/Stacks/prizeticket.yml b/Resources/Prototypes/Stacks/prizeticket.yml new file mode 100644 index 0000000000..1b84c81632 --- /dev/null +++ b/Resources/Prototypes/Stacks/prizeticket.yml @@ -0,0 +1,7 @@ +- type: stack + id: PrizeTicket + name: prize ticket + icon: { sprite: Objects/Fun/prizeticket.rsi, state: ticket } + spawn: PrizeTicket1 + maxCount: 100 + itemSize: 1 \ No newline at end of file diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index d823f93d9d..eb33b488fe 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1065,6 +1065,9 @@ - type: Tag id: PrisonUniform +- type: Tag + id: PrizeTicket + - type: Tag id: ProximitySensor diff --git a/Resources/Textures/Objects/Fun/catplushie.rsi/black.png b/Resources/Textures/Objects/Fun/catplushie.rsi/black.png new file mode 100644 index 0000000000..e62cb62916 Binary files /dev/null and b/Resources/Textures/Objects/Fun/catplushie.rsi/black.png differ diff --git a/Resources/Textures/Objects/Fun/catplushie.rsi/grey.png b/Resources/Textures/Objects/Fun/catplushie.rsi/grey.png new file mode 100644 index 0000000000..b941adbf78 Binary files /dev/null and b/Resources/Textures/Objects/Fun/catplushie.rsi/grey.png differ diff --git a/Resources/Textures/Objects/Fun/catplushie.rsi/meta.json b/Resources/Textures/Objects/Fun/catplushie.rsi/meta.json new file mode 100644 index 0000000000..878f438f4e --- /dev/null +++ b/Resources/Textures/Objects/Fun/catplushie.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "black" + }, + { + "name": "grey" + }, + { + "name": "orange" + }, + { + "name": "siames" + }, + { + "name": "tabby" + }, + { + "name": "tuxedo" + }, + { + "name": "white" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/catplushie.rsi/orange.png b/Resources/Textures/Objects/Fun/catplushie.rsi/orange.png new file mode 100644 index 0000000000..0f4cad131f Binary files /dev/null and b/Resources/Textures/Objects/Fun/catplushie.rsi/orange.png differ diff --git a/Resources/Textures/Objects/Fun/catplushie.rsi/siames.png b/Resources/Textures/Objects/Fun/catplushie.rsi/siames.png new file mode 100644 index 0000000000..6f27a86343 Binary files /dev/null and b/Resources/Textures/Objects/Fun/catplushie.rsi/siames.png differ diff --git a/Resources/Textures/Objects/Fun/catplushie.rsi/tabby.png b/Resources/Textures/Objects/Fun/catplushie.rsi/tabby.png new file mode 100644 index 0000000000..38575cc0de Binary files /dev/null and b/Resources/Textures/Objects/Fun/catplushie.rsi/tabby.png differ diff --git a/Resources/Textures/Objects/Fun/catplushie.rsi/tuxedo.png b/Resources/Textures/Objects/Fun/catplushie.rsi/tuxedo.png new file mode 100644 index 0000000000..327f8b455e Binary files /dev/null and b/Resources/Textures/Objects/Fun/catplushie.rsi/tuxedo.png differ diff --git a/Resources/Textures/Objects/Fun/catplushie.rsi/white.png b/Resources/Textures/Objects/Fun/catplushie.rsi/white.png new file mode 100644 index 0000000000..e16a9ed29d Binary files /dev/null and b/Resources/Textures/Objects/Fun/catplushie.rsi/white.png differ diff --git a/Resources/Textures/Objects/Fun/corgiplushie.rsi/corgi.png b/Resources/Textures/Objects/Fun/corgiplushie.rsi/corgi.png new file mode 100644 index 0000000000..83eaa3bb86 Binary files /dev/null and b/Resources/Textures/Objects/Fun/corgiplushie.rsi/corgi.png differ diff --git a/Resources/Textures/Objects/Fun/corgiplushie.rsi/girlycorgi.png b/Resources/Textures/Objects/Fun/corgiplushie.rsi/girlycorgi.png new file mode 100644 index 0000000000..bf8be50eea Binary files /dev/null and b/Resources/Textures/Objects/Fun/corgiplushie.rsi/girlycorgi.png differ diff --git a/Resources/Textures/Objects/Fun/corgiplushie.rsi/meta.json b/Resources/Textures/Objects/Fun/corgiplushie.rsi/meta.json new file mode 100644 index 0000000000..06c0cf9ed4 --- /dev/null +++ b/Resources/Textures/Objects/Fun/corgiplushie.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "corgi" + }, + { + "name": "girlycorgi" + }, + { + "name": "robotcorgi" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/corgiplushie.rsi/robotcorgi.png b/Resources/Textures/Objects/Fun/corgiplushie.rsi/robotcorgi.png new file mode 100644 index 0000000000..a8dfdfb3f3 Binary files /dev/null and b/Resources/Textures/Objects/Fun/corgiplushie.rsi/robotcorgi.png differ diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/black.png b/Resources/Textures/Objects/Fun/foxplushie.rsi/black.png new file mode 100644 index 0000000000..b314043924 Binary files /dev/null and b/Resources/Textures/Objects/Fun/foxplushie.rsi/black.png differ diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/blue.png b/Resources/Textures/Objects/Fun/foxplushie.rsi/blue.png new file mode 100644 index 0000000000..ccc9b2d7e4 Binary files /dev/null and b/Resources/Textures/Objects/Fun/foxplushie.rsi/blue.png differ diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/coffee.png b/Resources/Textures/Objects/Fun/foxplushie.rsi/coffee.png new file mode 100644 index 0000000000..81650c1b6f Binary files /dev/null and b/Resources/Textures/Objects/Fun/foxplushie.rsi/coffee.png differ diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/crimson.png b/Resources/Textures/Objects/Fun/foxplushie.rsi/crimson.png new file mode 100644 index 0000000000..0257506176 Binary files /dev/null and b/Resources/Textures/Objects/Fun/foxplushie.rsi/crimson.png differ diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/marble.png b/Resources/Textures/Objects/Fun/foxplushie.rsi/marble.png new file mode 100644 index 0000000000..b6f1cb9032 Binary files /dev/null and b/Resources/Textures/Objects/Fun/foxplushie.rsi/marble.png differ diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/meta.json b/Resources/Textures/Objects/Fun/foxplushie.rsi/meta.json new file mode 100644 index 0000000000..5842b1ad07 --- /dev/null +++ b/Resources/Textures/Objects/Fun/foxplushie.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "black" + }, + { + "name": "blue" + }, + { + "name": "coffee" + }, + { + "name": "crimson" + }, + { + "name": "marble" + }, + { + "name": "orange" + }, + { + "name": "pink" + }, + { + "name": "purple" + }, + { + "name": "red" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/orange.png b/Resources/Textures/Objects/Fun/foxplushie.rsi/orange.png new file mode 100644 index 0000000000..5bd3098c0d Binary files /dev/null and b/Resources/Textures/Objects/Fun/foxplushie.rsi/orange.png differ diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/pink.png b/Resources/Textures/Objects/Fun/foxplushie.rsi/pink.png new file mode 100644 index 0000000000..c07cdac4e7 Binary files /dev/null and b/Resources/Textures/Objects/Fun/foxplushie.rsi/pink.png differ diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/purple.png b/Resources/Textures/Objects/Fun/foxplushie.rsi/purple.png new file mode 100644 index 0000000000..18aa47315d Binary files /dev/null and b/Resources/Textures/Objects/Fun/foxplushie.rsi/purple.png differ diff --git a/Resources/Textures/Objects/Fun/foxplushie.rsi/red.png b/Resources/Textures/Objects/Fun/foxplushie.rsi/red.png new file mode 100644 index 0000000000..966108f7ab Binary files /dev/null and b/Resources/Textures/Objects/Fun/foxplushie.rsi/red.png differ diff --git a/Resources/Textures/Objects/Fun/petrock.rsi/fred.png b/Resources/Textures/Objects/Fun/petrock.rsi/fred.png new file mode 100644 index 0000000000..daa36c12fc Binary files /dev/null and b/Resources/Textures/Objects/Fun/petrock.rsi/fred.png differ diff --git a/Resources/Textures/Objects/Fun/petrock.rsi/meta.json b/Resources/Textures/Objects/Fun/petrock.rsi/meta.json new file mode 100644 index 0000000000..d39a58e623 --- /dev/null +++ b/Resources/Textures/Objects/Fun/petrock.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "rock" + }, + { + "name": "fred" + }, + { + "name": "roxie" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/petrock.rsi/rock.png b/Resources/Textures/Objects/Fun/petrock.rsi/rock.png new file mode 100644 index 0000000000..4f97dfeba6 Binary files /dev/null and b/Resources/Textures/Objects/Fun/petrock.rsi/rock.png differ diff --git a/Resources/Textures/Objects/Fun/petrock.rsi/roxie.png b/Resources/Textures/Objects/Fun/petrock.rsi/roxie.png new file mode 100644 index 0000000000..f0a2f48c6d Binary files /dev/null and b/Resources/Textures/Objects/Fun/petrock.rsi/roxie.png differ diff --git a/Resources/Textures/Objects/Fun/prizeticket.rsi/meta.json b/Resources/Textures/Objects/Fun/prizeticket.rsi/meta.json new file mode 100644 index 0000000000..bf0f0d3224 --- /dev/null +++ b/Resources/Textures/Objects/Fun/prizeticket.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "ticket" + }, + { + "name": "ticket_2" + }, + { + "name": "ticket_3" + }, + { + "name": "ticket_4" + }, + { + "name": "prizeball" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/prizeticket.rsi/prizeball.png b/Resources/Textures/Objects/Fun/prizeticket.rsi/prizeball.png new file mode 100644 index 0000000000..fd8290de14 Binary files /dev/null and b/Resources/Textures/Objects/Fun/prizeticket.rsi/prizeball.png differ diff --git a/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket.png b/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket.png new file mode 100644 index 0000000000..c52f243e9f Binary files /dev/null and b/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket.png differ diff --git a/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket_2.png b/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket_2.png new file mode 100644 index 0000000000..7e59f474e6 Binary files /dev/null and b/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket_2.png differ diff --git a/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket_3.png b/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket_3.png new file mode 100644 index 0000000000..00b58dcdf2 Binary files /dev/null and b/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket_3.png differ diff --git a/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket_4.png b/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket_4.png new file mode 100644 index 0000000000..fd4b9f5e6e Binary files /dev/null and b/Resources/Textures/Objects/Fun/prizeticket.rsi/ticket_4.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/abductor.png b/Resources/Textures/Objects/Fun/toys.rsi/abductor.png new file mode 100644 index 0000000000..f3efecc00e Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/abductor.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/abductor_agent.png b/Resources/Textures/Objects/Fun/toys.rsi/abductor_agent.png new file mode 100644 index 0000000000..59aefaca07 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/abductor_agent.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/deer.png b/Resources/Textures/Objects/Fun/toys.rsi/deer.png new file mode 100644 index 0000000000..d9bc621422 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/deer.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/gnome.png b/Resources/Textures/Objects/Fun/toys.rsi/gnome.png new file mode 100644 index 0000000000..7fdb97a688 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/gnome.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/grey.png b/Resources/Textures/Objects/Fun/toys.rsi/grey.png new file mode 100644 index 0000000000..6253fb8ca4 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/grey.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/ipc.png b/Resources/Textures/Objects/Fun/toys.rsi/ipc.png new file mode 100644 index 0000000000..ed8aac5cea Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/ipc.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/loveable.png b/Resources/Textures/Objects/Fun/toys.rsi/loveable.png new file mode 100644 index 0000000000..0011a2e831 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/loveable.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index 4975ba0461..4786ebbbeb 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -1,367 +1,403 @@ { - "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", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "plushie_ratvar" - }, - { - "name": "plushie_penguin" - }, - { - "name": "plushie_moth" - }, - { - "name": "plushie_rouny", - "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": "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" - }, - { - "name": "plushie_lizard_mirrored" - }, - { - "name": "lizard-equipped-HELMET", - "directions": 4 - }, - { - "name": "plushie_lamp" - }, - { - "name": "plushie_nuke" - }, - { - "name": "plushie_atmosian" - }, - { - "name": "plushie_slime" - }, - { - "name": "plushie_snake" - }, - { - "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": "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 - } - ] + "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), plushie_jester - plushie_trystan - plushie_vulp: gentlejester-148196053781315584 / plushie_slips: mintymoo-449394523089403905 / gnome/ipc/grey/loveable/abductor/abductor_agent/deer - Taken from Paradise Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "plushie_jester" + }, + { + "name": "plushie_arachne" + }, + { + "name": "plushie_slips" + }, + { + "name": "plushie_trystan" + }, + { + "name": "plushie_vulp" + }, + { + "name": "ipc" + }, + { + "name": "deer" + }, + { + "name": "grey" + }, + { + "name": "loveable" + }, + { + "name": "abductor" + }, + { + "name": "abductor_agent" + }, + { + "name": "gnome" + }, + { + "name": "plushie_ratvar" + }, + { + "name": "plushie_penguin" + }, + { + "name": "plushie_moth" + }, + { + "name": "plushie_rouny", + "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": "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" + }, + { + "name": "plushie_lizard_mirrored" + }, + { + "name": "lizard-equipped-HELMET", + "directions": 4 + }, + { + "name": "plushie_lamp" + }, + { + "name": "plushie_nuke" + }, + { + "name": "plushie_atmosian" + }, + { + "name": "plushie_slime" + }, + { + "name": "plushie_snake" + }, + { + "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": "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 + } + ] } diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_arachne.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_arachne.png new file mode 100644 index 0000000000..4f72c31ddf Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_arachne.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_jester.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_jester.png new file mode 100644 index 0000000000..267331f72f Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_jester.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_slips.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_slips.png new file mode 100644 index 0000000000..55b389ab56 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_slips.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_trystan.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_trystan.png new file mode 100644 index 0000000000..e822d59265 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_trystan.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_vulp.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_vulp.png new file mode 100644 index 0000000000..5b715fe734 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_vulp.png differ diff --git a/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box-inhand-left.png b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box-inhand-left.png new file mode 100644 index 0000000000..dc458a0a3f Binary files /dev/null and b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box-inhand-left.png differ diff --git a/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box-inhand-right.png b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box-inhand-right.png new file mode 100644 index 0000000000..49b15d7ac2 Binary files /dev/null and b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box-inhand-right.png differ diff --git a/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box-open.png b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box-open.png new file mode 100644 index 0000000000..46c6bc8213 Binary files /dev/null and b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box-open.png differ diff --git a/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box.png b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box.png new file mode 100644 index 0000000000..645491fe14 Binary files /dev/null and b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/box.png differ diff --git a/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/meta.json b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/meta.json new file mode 100644 index 0000000000..0241de806c --- /dev/null +++ b/Resources/Textures/Objects/Storage/Happyhonk/rock_carrier.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by ghostprince", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "box" + }, + { + "name": "box-open" + }, + { + "name": "box-inhand-left", + "directions": 4 + }, + { + "name": "box-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Structures/Machines/prizecounter.rsi/icon.png b/Resources/Textures/Structures/Machines/prizecounter.rsi/icon.png new file mode 100644 index 0000000000..4a2e7df733 Binary files /dev/null and b/Resources/Textures/Structures/Machines/prizecounter.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Machines/prizecounter.rsi/meta.json b/Resources/Textures/Structures/Machines/prizecounter.rsi/meta.json new file mode 100644 index 0000000000..c8a01ff8d8 --- /dev/null +++ b/Resources/Textures/Structures/Machines/prizecounter.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "unlit" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/Structures/Machines/prizecounter.rsi/panel.png b/Resources/Textures/Structures/Machines/prizecounter.rsi/panel.png new file mode 100644 index 0000000000..65dce282de Binary files /dev/null and b/Resources/Textures/Structures/Machines/prizecounter.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/prizecounter.rsi/unlit.png b/Resources/Textures/Structures/Machines/prizecounter.rsi/unlit.png new file mode 100644 index 0000000000..45074c1ac4 Binary files /dev/null and b/Resources/Textures/Structures/Machines/prizecounter.rsi/unlit.png differ diff --git a/Resources/eeMigration.yml b/Resources/eeMigration.yml new file mode 100644 index 0000000000..26713f6cba --- /dev/null +++ b/Resources/eeMigration.yml @@ -0,0 +1,3 @@ +# 2024-06-08 +CrateFunPlushie: CrateFunToyBox +CrateFunLizardPlushieBulk: CrateFunToyBox