From 9a32e4d06a700911323be20d42301e01a4752e6e Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Sun, 16 Jul 2023 02:07:47 -0500 Subject: [PATCH] Collectible figurines! (#17993) * adds spacemen figurines * dode dode dode * dodeulation * you know what they say * bunger * bunger bunger bunger bunger bunger --- .../VendingMachines/Inventories/games.yml | 1 + .../Markers/Spawners/Random/maintenance.yml | 1 + .../Entities/Markers/Spawners/Random/toy.yml | 52 +++- .../Consumable/Food/Containers/box.yml | 4 +- .../Entities/Objects/Decoration/present.yml | 2 +- .../Entities/Objects/Fun/figurine_boxes.yml | 88 +++++++ .../Entities/Objects/Fun/figurines.yml | 249 ++++++++++++++++++ .../Entities/Objects/Fun/mech_figurines.yml | 139 ++++++++++ .../Prototypes/Entities/Objects/Fun/toys.yml | 161 +---------- .../Objects/Fun/figurines.rsi/atmos.png | Bin 0 -> 445 bytes .../Objects/Fun/figurines.rsi/captain.png | Bin 0 -> 451 bytes .../Objects/Fun/figurines.rsi/cargotech.png | Bin 0 -> 408 bytes .../Objects/Fun/figurines.rsi/clown.png | Bin 0 -> 430 bytes .../Objects/Fun/figurines.rsi/engineer.png | Bin 0 -> 512 bytes .../Objects/Fun/figurines.rsi/fig_box.png | Bin 0 -> 377 bytes .../Fun/figurines.rsi/fig_box_unfolded.png | Bin 0 -> 255 bytes .../Fun/figurines.rsi/figurine_spawner.png | Bin 0 -> 561 bytes .../Objects/Fun/figurines.rsi/footsoldier.png | Bin 0 -> 480 bytes .../griffinprize.png | Bin .../Objects/Fun/figurines.rsi/librarian.png | Bin 0 -> 403 bytes .../Objects/Fun/figurines.rsi/medical.png | Bin 0 -> 416 bytes .../Objects/Fun/figurines.rsi/meta.json | 95 +++++++ .../Objects/Fun/figurines.rsi/mime.png | Bin 0 -> 395 bytes .../Objects/Fun/figurines.rsi/nukie.png | Bin 0 -> 413 bytes .../Fun/figurines.rsi/nukie_commander.png | Bin 0 -> 416 bytes .../Objects/Fun/figurines.rsi/nukie_elite.png | Bin 0 -> 438 bytes .../{toys.rsi => figurines.rsi}/owlprize.png | Bin .../Objects/Fun/figurines.rsi/passenger.png | Bin 0 -> 375 bytes .../Fun/figurines.rsi/passenger_greytide.png | Bin 0 -> 423 bytes .../Textures/Objects/Fun/figurines.rsi/qm.png | Bin 0 -> 412 bytes .../Objects/Fun/figurines.rsi/queen.png | Bin 0 -> 489 bytes .../Objects/Fun/figurines.rsi/salvage.png | Bin 0 -> 446 bytes .../Objects/Fun/figurines.rsi/scientist.png | Bin 0 -> 395 bytes .../Objects/Fun/figurines.rsi/security.png | Bin 0 -> 470 bytes .../skeletonprize.png | Bin .../Objects/Fun/figurines.rsi/slime.png | Bin 0 -> 364 bytes .../Objects/Fun/figurines.rsi/wizard.png | Bin 0 -> 414 bytes .../Objects/Fun/figurines.rsi/wizard_fake.png | Bin 0 -> 394 bytes .../deathripley.png} | Bin .../durand.png} | Bin .../fireripley.png} | Bin .../gygax.png} | Bin .../honk.png} | Bin .../marauder.png} | Bin .../mauler.png} | Bin .../Objects/Fun/mech_figurines.rsi/meta.json | 47 ++++ .../odysseus.png} | Bin .../phazon.png} | Bin .../reticence.png} | Bin .../ripley.png} | Bin .../seraph.png} | Bin .../Objects/Fun/toys.rsi/doll-inhand-left.png | Bin 452 -> 0 bytes .../Fun/toys.rsi/doll-inhand-right.png | Bin 450 -> 0 bytes .../Textures/Objects/Fun/toys.rsi/doll.png | Bin 204 -> 0 bytes .../Textures/Objects/Fun/toys.rsi/meta.json | 56 ---- Resources/migration.yml | 3 + 56 files changed, 679 insertions(+), 219 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml create mode 100644 Resources/Prototypes/Entities/Objects/Fun/figurines.yml create mode 100644 Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/atmos.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/captain.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/cargotech.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/clown.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/engineer.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/fig_box.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/fig_box_unfolded.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/figurine_spawner.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/footsoldier.png rename Resources/Textures/Objects/Fun/{toys.rsi => figurines.rsi}/griffinprize.png (100%) create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/librarian.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/medical.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/meta.json create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/mime.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/nukie.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/nukie_commander.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/nukie_elite.png rename Resources/Textures/Objects/Fun/{toys.rsi => figurines.rsi}/owlprize.png (100%) create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/passenger.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/passenger_greytide.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/qm.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/queen.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/salvage.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/scientist.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/security.png rename Resources/Textures/Objects/Fun/{toys.rsi => figurines.rsi}/skeletonprize.png (100%) create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/slime.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/wizard.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/wizard_fake.png rename Resources/Textures/Objects/Fun/{toys.rsi/deathripleytoy.png => mech_figurines.rsi/deathripley.png} (100%) rename Resources/Textures/Objects/Fun/{toys.rsi/durandprize.png => mech_figurines.rsi/durand.png} (100%) rename Resources/Textures/Objects/Fun/{toys.rsi/fireripleytoy.png => mech_figurines.rsi/fireripley.png} (100%) rename Resources/Textures/Objects/Fun/{toys.rsi/gygaxtoy.png => mech_figurines.rsi/gygax.png} (100%) rename Resources/Textures/Objects/Fun/{toys.rsi/honkprize.png => mech_figurines.rsi/honk.png} (100%) rename Resources/Textures/Objects/Fun/{toys.rsi/marauderprize.png => mech_figurines.rsi/marauder.png} (100%) rename Resources/Textures/Objects/Fun/{toys.rsi/maulerprize.png => mech_figurines.rsi/mauler.png} (100%) create mode 100644 Resources/Textures/Objects/Fun/mech_figurines.rsi/meta.json rename Resources/Textures/Objects/Fun/{toys.rsi/odysseusprize.png => mech_figurines.rsi/odysseus.png} (100%) rename Resources/Textures/Objects/Fun/{toys.rsi/phazonprize.png => mech_figurines.rsi/phazon.png} (100%) rename Resources/Textures/Objects/Fun/{toys.rsi/reticenceprize.png => mech_figurines.rsi/reticence.png} (100%) rename Resources/Textures/Objects/Fun/{toys.rsi/ripleytoy.png => mech_figurines.rsi/ripley.png} (100%) rename Resources/Textures/Objects/Fun/{toys.rsi/seraphprize.png => mech_figurines.rsi/seraph.png} (100%) delete mode 100644 Resources/Textures/Objects/Fun/toys.rsi/doll-inhand-left.png delete mode 100644 Resources/Textures/Objects/Fun/toys.rsi/doll-inhand-right.png delete mode 100644 Resources/Textures/Objects/Fun/toys.rsi/doll.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml index 059ce5f9bb..99d4e516b1 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml @@ -8,4 +8,5 @@ BackgammonBoard: 1 ParchisBoard: 1 CheckerBoard: 1 + MysteryFigureBox: 2 BooksBag: 3 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index da09e3baff..8f0f576dfd 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -36,6 +36,7 @@ - ClothingNeckTransPin - CluwneHorn - ClothingMaskRat + - MysteryFigureBox rareChance: 0.01 prototypes: - Lighter diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index b4cb46f772..0e355d774f 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -37,20 +37,20 @@ offset: 0.2 - type: entity - name: Figure Spawner + name: Prize Figurine Spawner id: FigureSpawner parent: MarkerBase components: - type: Sprite layers: - state: red - - sprite: Objects/Fun/toys.rsi - state: ripleytoy + - sprite: Objects/Fun/mech_figurines.rsi + state: ripley - type: RandomSpawner prototypes: - ToyAi - ToyNuke - - ToyAssistant + - ToyFigurinePassenger - ToyGriffin - ToyHonk - ToyIan @@ -67,5 +67,49 @@ - ToySeraph - ToyDurand - ToySkeleton + - MysteryFigureBox chance: 0.5 offset: 0.2 + +- type: entity + name: Spacemen Minifigure Spawner + suffix: Librarian only, map with care! + id: SpacemenFigureSpawner + parent: MarkerBase + components: + - type: Sprite + layers: + - sprite: Objects/Fun/figurines.rsi + state: figurine_spawner + - type: RandomSpawner + rarePrototypes: + - ToyFigurineNukieElite + - ToyFigurineNukieCommander + rareChance: 0.05 + prototypes: + - ToyFigurinePassenger + - ToyFigurineClown + - ToyFigurineMime + - ToyFigurineCaptain + - ToyFigurineSecurity + - ToyFigurineCargoTech + - ToyFigurineSalvage + - ToyFigurineQuartermaster + - ToyFigurineAtmosTech + - ToyFigurineEngineer + - ToyFigurineEngineer + - ToyFigurineScientist + - ToyFigurineMedicalDoctor + - ToyFigurineLibrarian + - ToyFigurineNukie + - ToyFigurineFootsoldier + - ToyFigurineWizardFake + - ToyFigurineSlime + - ToyFigurineGreytider + - ToyFigurineWizard + - ToyGriffin + - ToyOwlman + - ToySkeleton + - ToyFigurineQueen + chance: 0.90 + offset: 0.2 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index 3751574a6c..4d7c06cd43 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -472,7 +472,7 @@ orGroup: GiftPool - id: ToyNuke orGroup: GiftPool - - id: ToyAssistant + - id: ToyFigurinePassenger orGroup: GiftPool - id: ToyGriffin orGroup: GiftPool @@ -617,7 +617,7 @@ orGroup: GiftPool - id: ToyNuke orGroup: GiftPool - - id: ToyAssistant + - id: ToyFigurinePassenger orGroup: GiftPool - id: ToyGriffin orGroup: GiftPool diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index 080aca80ba..14a1dfbb5e 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -98,7 +98,7 @@ orGroup: GiftPool - id: ToyNuke orGroup: GiftPool - - id: ToyAssistant + - id: ToyFigurinePassenger orGroup: GiftPool - id: ToyGriffin orGroup: GiftPool diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml new file mode 100644 index 0000000000..4e43af4b90 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml @@ -0,0 +1,88 @@ +- type: entity + id: MysteryFigureBoxTrash + parent: BaseItem + name: unfolded cardboard box + description: A small, unfolded cardboard toy box. + components: + - type: PhysicalComposition + materialComposition: + Cardboard: 50 + - type: Sprite + sprite: Objects/Fun/figurines.rsi + state: fig_box_unfolded + - type: Tag + tags: + - Trash + - type: SpaceGarbage + +- type: entity + parent: PresentRandom + id: MysteryFigureBox + name: mystery spacemen minifigure box + description: A box containing a mystery minifigure. The side of the box depicts a few blacked-out 'rare' figures, including one with a large, non-humanoid shilouette. + components: + - type: Sprite + sprite: Objects/Fun/figurines.rsi + layers: + - state: fig_box + - type: SpawnItemsOnUse + items: + - id: MysteryFigureBoxTrash + - id: ToyFigurinePassenger + orGroup: SpacemenFig + - id: ToyFigurineClown + orGroup: SpacemenFig + - id: ToyFigurineMime + orGroup: SpacemenFig + - id: ToyFigurineCaptain + orGroup: SpacemenFig + - id: ToyFigurineSecurity + orGroup: SpacemenFig + - id: ToyFigurineCargoTech + orGroup: SpacemenFig + - id: ToyFigurineSalvage + orGroup: SpacemenFig + - id: ToyFigurineQuartermaster + orGroup: SpacemenFig + - id: ToyFigurineAtmosTech + orGroup: SpacemenFig + - id: ToyFigurineEngineer + orGroup: SpacemenFig + - id: ToyFigurineEngineer + orGroup: SpacemenFig + - id: ToyFigurineScientist + orGroup: SpacemenFig + - id: ToyFigurineMedicalDoctor + orGroup: SpacemenFig + - id: ToyFigurineLibrarian + orGroup: SpacemenFig + - id: ToyFigurineNukie + orGroup: SpacemenFig + - id: ToyFigurineNukieElite + orGroup: SpacemenFig + - id: ToyFigurineFootsoldier + orGroup: SpacemenFig + - id: ToyFigurineWizardFake + orGroup: SpacemenFig + - id: ToyFigurineSlime + orGroup: SpacemenFig + - id: ToyFigurineGreytider + orGroup: SpacemenFig + - id: ToyFigurineWizard + prob: 0.50 + orGroup: SpacemenFig + - id: ToyFigurineNukieCommander + prob: 0.50 + orGroup: SpacemenFig + - id: ToyGriffin + prob: 0.50 + orGroup: SpacemenFig + - id: ToyOwlman + prob: 0.50 + orGroup: SpacemenFig + - id: ToySkeleton + prob: 0.50 + orGroup: SpacemenFig + - id: ToyFigurineQueen + prob: 0.25 + orGroup: SpacemenFig \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml new file mode 100644 index 0000000000..4ea2084d76 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml @@ -0,0 +1,249 @@ +#HUMANOID FIGURINES + +- type: entity + parent: BaseItem + id: BaseFigurine + name: figurine + description: A small miniature. + abstract: true + components: + - type: Sprite + sprite: Objects/Fun/figurines.rsi + - type: PhysicalComposition + materialComposition: + Plastic: 100 + - type: StaticPrice + price: 75 + - type: Tag + tags: + - Figurine + +- type: entity + parent: BaseFigurine + id: ToyFigurinePassenger + name: passenger figure + description: A figurine depicting an every day, run-of-the-mill passenger. No funny business here. + components: + - type: Sprite + state: passenger + +- type: entity + parent: BaseFigurine + id: ToyFigurineGreytider + name: greytider figure + description: A figurine depicting a dubious-looking passenger. Greytide worldwide! + components: + - type: Sprite + state: passenger_greytide + +- type: entity + parent: BaseFigurine + id: ToyFigurineClown + name: clown figure + description: A figurine depicting a clown. You shudder to think of what people have probably done to this figurine before. + components: + - type: Sprite + state: clown + +- type: entity + parent: BaseFigurine + id: ToyFigurineMime + name: mime figure + description: A figurine depicting that silent bastard you are all too familiar with. + components: + - type: Sprite + state: mime + +- type: entity + parent: BaseFigurine + id: ToyFigurineCaptain + name: captain figure + description: A figurine depicting the standard outfit of a captain belonging to a civilian-sector Nanotrasen vessel. + components: + - type: Sprite + state: captain + +- type: entity + parent: BaseFigurine + id: ToyFigurineSecurity + name: security officer figure + description: A figurine depicting a Security Officer holding a stunbaton, ready to defend the station. + components: + - type: Sprite + state: security + +- type: entity + parent: BaseFigurine + id: ToyFigurineCargoTech + name: cargo technican figure + description: A figurine depicting a reptillian Cargo Technican. + components: + - type: Sprite + state: cargotech + +- type: entity + parent: BaseFigurine + id: ToyFigurineSalvage + name: salvage technican figure + description: A figurine depicting a Salvage Technician holding a survival knife. + components: + - type: Sprite + state: salvage + +- type: entity + parent: BaseFigurine + id: ToyFigurineQuartermaster + name: quartermaster figure + description: A figurine depicting the glorious head of the Cargo department. + components: + - type: Sprite + state: qm + +- type: entity + parent: BaseFigurine + id: ToyFigurineEngineer + name: station engineer figure + description: A figurine depicting a Station Engineer holding a crowbar at-ready. + components: + - type: Sprite + state: engineer + +- type: entity + parent: BaseFigurine + id: ToyFigurineAtmosTech + name: atmospheric technician figure + description: A figurine depicting an Atmos Tech holding an unlit welder. + components: + - type: Sprite + state: atmos + +- type: entity + parent: BaseFigurine + id: ToyFigurineScientist + name: scientist figurine + description: A figurine depicting a Scienist donning a labcoat. + components: + - type: Sprite + state: scientist + +- type: entity + parent: BaseFigurine + id: ToyFigurineMedicalDoctor + name: medical doctor figure + description: A figurine depicting a Medical Doctor, donning a labcoat & syringe. + components: + - type: Sprite + state: medical + +- type: entity + parent: BaseFigurine + id: ToyFigurineLibrarian + name: librarian figure + description: A figurine depicting the one-and-only librarian. + components: + - type: Sprite + state: librarian + +- type: entity + parent: BaseFigurine + id: ToyFigurineNukie + name: syndicate operative figure + description: A figurine depicting someone in a blood-red hardsuit, similar to what someone on a nuclear operative team might wear. + components: + - type: Sprite + state: nukie + +- type: entity + parent: BaseFigurine + id: ToyFigurineNukieElite + name: elite syndicate operative figure + description: A figurine depicting someone in an elite blood-red hardsuit, similar to what the medic of a nuclear operative team might wear. + components: + - type: Sprite + state: nukie_elite + +- type: entity + parent: BaseFigurine + id: ToyFigurineNukieCommander + name: syndicate operative commander figure + description: A figurine depicting someone in a beefed-up blood-red hardsuit, similar to what the commander of a nuclear operative team might wear. + components: + - type: Sprite + state: nukie_commander + +- type: entity + parent: BaseFigurine + id: ToyFigurineFootsoldier + name: syndicate footsoldier figure + description: A figurine depicting the outfit of a syndicate footsoldier. + components: + - type: Sprite + state: footsoldier + +- type: entity + parent: BaseFigurine + id: ToyFigurineWizard + name: wizard figure + description: A figurine depicting someone with a long, silky beard wearing a wizard outfit. Warlocks wish they had anything on this. + components: + - type: Sprite + state: wizard + +- type: entity + parent: BaseFigurine + id: ToyFigurineWizardFake + name: fake wizard figure + description: A figurine depicting someone in a fake-ass wizard costume. What a ripoff! + components: + - type: Sprite + state: wizard_fake + +#Nonhuman Figurines + +- type: entity + parent: BaseFigurine + id: ToyFigurineQueen + name: xeno queen figure + description: A large figurine depicting a xeno queen, ready to attack. + components: + - type: Sprite + state: queen + +- type: entity + parent: BaseFigurine + id: ToyFigurineSlime + name: slime figure + description: A figurine depicting a translucent blue slime. + components: + - type: Sprite + state: slime + +#TODO: Convert these to the new figurine sprite template and rename their sprite name. +#Yes, these are humanoids, but they need to be updated first. + +- type: entity + parent: BaseFigurine + id: ToyGriffin + name: griffin figure + description: An action figure modeled after 'The Griffin', criminal mastermind. + components: + - type: Sprite + state: griffinprize + +- type: entity + parent: BaseFigurine + id: ToyOwlman + name: owl figure + description: An action figure modeled after 'The Owl', defender of justice. + components: + - type: Sprite + state: owlprize + +- type: entity + parent: BaseFigurine + id: ToySkeleton + name: skeleton figure + description: Spooked ya! + components: + - type: Sprite + state: skeletonprize diff --git a/Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml new file mode 100644 index 0000000000..7cc6aaaeaf --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml @@ -0,0 +1,139 @@ +#TODO give these the new base sprite used in the regular action figures. +#No, not like a template. Just the base of the toy. +- type: entity + parent: BaseItem + id: BaseFigurineMech + name: figurine + description: A small miniature. + abstract: true + components: + - type: Sprite + sprite: Objects/Fun/mech_figurines.rsi + - type: PhysicalComposition + materialComposition: + Plastic: 100 + - type: StaticPrice + price: 75 + - type: Tag + tags: + - Figurine + +#Ripley APLU +- type: entity + parent: BaseFigurineMech + id: ToyRipley + name: ripley toy + description: Mini-Mecha action figure! 'Mecha No. 1/12' is written on the back. + components: + - type: Sprite + state: ripley + +#Fire Ripley +- type: entity + parent: BaseFigurineMech + id: ToyFireRipley + name: fire ripley + description: Mini-Mecha action figure! 'Mecha No. 2/12' is written on the back. + components: + - type: Sprite + state: fireripley + +#Death Ripley +- type: entity + parent: BaseFigurineMech + id: ToyDeathRipley + name: deathripley toy + description: Mini-Mecha action figure! 'Mecha No. 3/12' is written on the back. + components: + - type: Sprite + state: deathripley + +#Ggygax +- type: entity + parent: BaseFigurineMech + id: ToyGygax + name: gygax toy + description: Mini-Mecha action figure! 'Mecha No. 4/12' is written on the back. + components: + - type: Sprite + state: gygax + +#Durand +- type: entity + parent: BaseFigurineMech + id: ToyDurand + name: durand toy + description: Mini-Mecha action figure! 'Mecha No. 5/12' is written on the back. + components: + - type: Sprite + state: durand + +#H.O.N.K +- type: entity + parent: BaseFigurineMech + id: ToyHonk + name: H.O.N.K. toy + description: Mini-Mecha action figure! 'Mecha No. 6/12' is written on the back. + components: + - type: Sprite + state: honk + +#Marauder +- type: entity + parent: BaseFigurineMech + id: ToyMarauder + name: marauder toy + description: Mini-Mecha action figure! 'Mecha No. 7/12' is written on the back. + components: + - type: Sprite + state: marauder + +#Seraph +- type: entity + parent: BaseFigurineMech + id: ToySeraph + name: seraph toy + description: Mini-Mecha action figure! 'Mecha No. 8/12' is written on the back. + components: + - type: Sprite + state: seraph + +#Mauler +- type: entity + parent: BaseFigurineMech + id: ToyMauler + name: mauler toy + description: Mini-Mecha action figure! 'Mecha No. 9/12' is written on the back. + components: + - type: Sprite + state: mauler + +#Odysseus +- type: entity + parent: BaseFigurineMech + id: ToyOdysseus + name: odysseus toy + description: Mini-Mecha action figure! 'Mecha No. 10/12' is written on the back. + components: + - type: Sprite + state: odysseus + +#Phazon +- type: entity + parent: BaseFigurineMech + id: ToyPhazon + name: phazon toy + description: Mini-Mecha action figure! 'Mecha No. 11/12' is written on the back. + components: + - type: Sprite + state: phazon + +#Reticence +- type: entity + parent: BaseFigurineMech + id: ToyReticence + name: reticence toy + description: Mini-Mecha action figure! 'Mecha No. 12/12' is written on the back. + components: + - type: Sprite + state: reticence diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index e6f1dc8a74..02a9f6c521 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -458,11 +458,11 @@ soundHit: path: /Audio/Weapons/Xeno/alien_spitacid.ogg -## Figurines +## Cheapo Figurines - type: entity parent: BaseItem - id: BaseFigurine + id: BaseFigurineCheapo name: figurine description: A small miniature. abstract: true @@ -473,13 +473,13 @@ materialComposition: Plastic: 100 - type: StaticPrice - price: 10 + price: 25 - type: Tag tags: - Figurine - type: entity - parent: BaseFigurine + parent: BaseFigurineCheapo id: ToyAi name: AI toy description: A scaled-down toy AI core. @@ -488,7 +488,7 @@ state: AI - type: entity - parent: BaseFigurine + parent: BaseFigurineCheapo id: ToyNuke name: nuke toy description: A plastic model of a Nuclear Fission Explosive. No uranium included... probably. @@ -510,36 +510,6 @@ volume: -5 maxdistance: 10 -- type: entity - parent: BaseFigurine - id: ToyAssistant # TODO rename but needs map changes - name: passenger toy - description: Grey tide world wide! - components: - - type: Sprite - state: doll - - type: Item - sprite: Objects/Fun/toys.rsi - heldPrefix: doll - -- type: entity - parent: BaseFigurine - id: ToyGriffin - name: griffin toy - description: An action figure modeled after 'The Griffin', criminal mastermind. - components: - - type: Sprite - state: griffinprize - -- type: entity - parent: BaseFigurine - id: ToyHonk - name: H.O.N.K. toy - description: Mini-Mecha action figure! 'Mecha No. 6/12' is written on the back. - components: - - type: Sprite - state: honkprize - - type: entity parent: BasePlushie id: ToyIan @@ -555,127 +525,6 @@ soundHit: path: /Audio/Items/Toys/ian.ogg -- type: entity - parent: BaseFigurine - id: ToyMarauder - name: marauder toy - description: Mini-Mecha action figure! 'Mecha No. 7/12' is written on the back. - components: - - type: Sprite - state: marauderprize - -- type: entity - parent: BaseFigurine - id: ToyMauler - name: mauler toy - description: Mini-Mecha action figure! 'Mecha No. 9/12' is written on the back. - components: - - type: Sprite - state: maulerprize - -- type: entity - parent: BaseFigurine - id: ToyGygax - name: gygax toy - description: Mini-Mecha action figure! 'Mecha No. 4/12' is written on the back. - components: - - type: Sprite - state: gygaxtoy - -- type: entity - parent: BaseFigurine - id: ToyOdysseus - name: odysseus toy - description: Mini-Mecha action figure! 'Mecha No. 10/12' is written on the back. - components: - - type: Sprite - state: odysseusprize - -- type: entity - parent: BaseFigurine - id: ToyOwlman - name: owl toy - description: An action figure modeled after 'The Owl', defender of justice. - components: - - type: Sprite - state: owlprize - -- type: entity - parent: BaseFigurine - id: ToyDeathRipley - name: deathripley toy - description: Mini-Mecha action figure! 'Mecha No. 3/12' is written on the back. - components: - - type: Sprite - state: deathripleytoy - -- type: entity - parent: BaseFigurine - id: ToyPhazon - name: phazon toy - description: Mini-Mecha action figure! 'Mecha No. 11/12' is written on the back. - components: - - type: Sprite - state: phazonprize - -- type: entity - parent: BaseFigurine - id: ToyFireRipley - name: fire ripley - description: Mini-Mecha action figure! 'Mecha No. 2/12' is written on the back. - components: - - type: Sprite - state: fireripleytoy - -- type: entity - parent: BaseFigurine - id: ToyReticence - name: reticence toy - description: Mini-Mecha action figure! 'Mecha No. 12/12' is written on the back. - components: - - type: Sprite - state: reticenceprize - -- type: entity - parent: BaseFigurine - id: ToyRipley - name: ripley toy - description: Mini-Mecha action figure! 'Mecha No. 1/12' is written on the back. - components: - - type: Sprite - state: ripleytoy - -- type: entity - parent: BaseFigurine - id: ToySeraph - name: seraph toy - description: Mini-Mecha action figure! 'Mecha No. 8/12' is written on the back. - components: - - type: Sprite - state: seraphprize - -- type: entity - parent: BaseFigurine - id: ToyDurand - name: durand toy - description: Mini-Mecha action figure! 'Mecha No. 5/12' is written on the back. - components: - - type: Sprite - state: durandprize - - -### Yeah I left these all mixed up for a future coder to puzzle over, it's lore. -### Help i'm sorting these and my previous self let this message here to taunt me aaaaa - -- type: entity - parent: BaseFigurine - id: ToySkeleton - name: skeleton toy - description: Spooked ya! - components: - - type: Sprite - state: skeletonprize - ## Toyweapons - type: entity diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/atmos.png b/Resources/Textures/Objects/Fun/figurines.rsi/atmos.png new file mode 100644 index 0000000000000000000000000000000000000000..1cf2c9b3e8383a922890baee2fdede5c5a0e5564 GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik*1AIbUuN^AAy=m_Mdl!HLUoRehv2RthuVHz-;lv6ChP=rPOaK3W$1s1c z!u09W|9@h*e1YT80tPdE`B$6y{k*-??A2QWbkhP&>+0(M|Np;k%^F@_-U0`$$>G); zb3ON0hMZ}O1sZ!n&b|gnDV7BJ1p}4g1q|~KUQh%o<}C1tEM{QfI}E~%$MaXD00p;s zx;Tbd_&@ExE7YVQ;3jU$=qSAQ%Ab?p>raW@ni-+~b|0Vkhqv=2%M$+{isyQ;(EMQ1 zi~Jr7MvjJ*WCKSPO}Rpq3O*Kro0^C7HP~lN@SdtU^F7zD6TMoWoPzm|G+n(k#VyO* zQh@tvezSKSW& zTKAW(Dm{-a&VIIe=qq|Y`oOzSA9P*>@IExIc_7|WTFdnQZt=F-5UD3XA24{j`njxg HN@xNACgjHO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/captain.png b/Resources/Textures/Objects/Fun/figurines.rsi/captain.png new file mode 100644 index 0000000000000000000000000000000000000000..8654715cb63a62e2d4d2f977dba5cabd0f905277 GIT binary patch literal 451 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijQ0(?STH_TvQ)^Q1RV`hzLk8xC!l$2b%c5RHW?f)en|4&V2u*m+txAyF};SD7_m zc(^tmWL>*RR#imp!8f_W9t$P2la_{ts{H~%$$H0@OtEolFgeVvQ8|NQ=hg|0TP?$X z@Fg7F#Wa5k|Biq#hVX_}OKJ|VK0gq-NA@Xm;HJD=i*mEPzopr07*`}SpWb4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/cargotech.png b/Resources/Textures/Objects/Fun/figurines.rsi/cargotech.png new file mode 100644 index 0000000000000000000000000000000000000000..732ec53eda8d236dd53171e64c07464b426af6e6 GIT binary patch literal 408 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij)0(?STd(!x}cS~Q}tiiC1fuW6oVGDy^)KZ4&3|U!On>TNsK7G2DmX@cd z=gpfp>+0(M|Np;k&6-GE#sUYe$>G);b3ON0hMZ}O1sc}A>T)KKk|+uC3kE8~1{lr? z>%9W1;VkfoEM{QfI}E~%$MaXD00p;tx;Tbd_`mJD%hznc;nsNQ)~ev==WG6(%Z5%8 zeZ1+ls`cIl7nJKZ)IQXgsbJ(PGmqi+aH;rpY?V+&Ji~#5YOP)m4isHpd{wQrN`AA* zjyn6+DH4lr+%0fY5?PXR*HL##&lQ2R^c_5sAq{^Fn_UjDIWGEYt;f9m?%wRXO!^sJ zZ-nQVFLCQPZR3`VT=c{K3e)jA3HiqtqU!@VFPoe_z3EI;ZcqjHuU&TBtF6p}V@_z- dIo#MLKEXVAq5iD5T0jplc)I$ztaD0e0sx1zsM!Dj literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/clown.png b/Resources/Textures/Objects/Fun/figurines.rsi/clown.png new file mode 100644 index 0000000000000000000000000000000000000000..244e1b61ad197aedba0859521805f74d7be88776 GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij=0(?STKh;Y-%;CLu=FI>94F7?c;s1}WuKx_iOE@@GOP759{Q3WZ|F<{I z1xehy@b%(hM!za%%ZMWk4EFZ-XBz+iZ){xPpfx$%dSkBV{>qRuZLvUu#gb3%08%m~ zL4LtNGjRb1@lB7e1J!XBctjR6Fz_7)VaDV6D^h@hyFFbTLoEF7_B|A9Qs8lOJmY3z zYJ9fh|M#2?k(Vcbz5m+rTkdxTwSNx_nha&8&HZ`hiuts%*<5+5TM}|7Zdl^cAFx#Q z;MBgBk_$~jNjj&5Yg<*)ltZ4snm(cDY>jS1JGZW9kC?)b3DckSh-H1~c(HNXoQqDE ze+e|@N1c>ZWw^F)ciBF-+T&ghZ+_4FXYIryrCug4**NjY3+=qacN=%}TdVgxwy+fv s4!xv&kIDDBy76S?yJw~M6|yKE6QBM#kzrn=9>{MDp00i_>zopr02=AR&;S4c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/engineer.png b/Resources/Textures/Objects/Fun/figurines.rsi/engineer.png new file mode 100644 index 0000000000000000000000000000000000000000..f91b04248071c117f51affb1bd323a49629d4470 GIT binary patch literal 512 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil;0(?STjpZ29To`hqybdg2_;*!eaxPPOyrGkmQ`&v|W$$utZ<_o6-UXoA zuNM!$*taU$*KlG5L!TML|9Xc1?-=IKRhT|~`u|T1moIRb>C303rRnMErP-^u1n8y( znudmi99qDT=A~$+CwpkRYgeXjfrHlMaO;h^p8G39&a}k>jV*LI`U^;Dl?3?(|0fnO z7_Ima1JuP?;1OBOz`%DHgc*j2vOinri^SPIU@I)+Ym{2ol3KAKzwgO zXTRG5PDg=vhZP!99GprnxJ=;j=ve$@hKr#Jvry11RY_k($(+Wgn&&HK8K02e7GN-I zx@9Ws6W(Zx&?(cMLQ0u=d2cNgc;3B3tT$IdQEU#k;OTFZ6(XmX`fM|G;T8Ke+bV$B z<3;;MdG?%$LngkTH|cENwQzAI*Q?UK*4C*)jC|m>&M_W5ryc2N^tF L{an^LB{Ts5QYF{< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/fig_box.png b/Resources/Textures/Objects/Fun/figurines.rsi/fig_box.png new file mode 100644 index 0000000000000000000000000000000000000000..2ab3e0e145d9493b5a9df8b1222a3c0365284a3d GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijQ0(?ST3yO1Y-n_Ye`}QMq$`6*6)tBvm_UxImyt15lBSEK+1%RF5iLoEE? zo;xknWWdw{duU%JnZ){j+LtqM4PPfSvh5rwIy2S;JMT zn=HjnsPg@|)568L;7t|Vh6l@@#HLm9*t}`A&?wwv#7M-n@AeD6`Asz6y|HFA4Gs{tpHWQr^sN zKq1ZokH}&M2EM}}%y>M1MG8P6gV0#{)v45|3vVWk~J@~HXJ+` zdSrUgYw7xgII%5H%vZ4qgfX^7E@;-gqO0tnP~Yz{!P)IV1k)3DCN;jIUF^H#Ic_F> p+PQTh6gX&2 z4!7Qz>$$%&&Yly=E)%UCs{{k5b{yApYKbv(x!q`{R>Pv%~!8KD|lX?3c zg`eDcDF$7DTD}0e#Hi>FVdQ I&MBb@0KwD<1N8L_og7{G^Hxg4Ew!<+>F(}6a^%R&nKMO2MGXxN z9UUB`rKR)o@;p5~*K2G4x3{;ov5Aa~jERo+ba%J6x7X6r($v(HlN9o_)hvi}GSZac z<>fUqGn18-EpX799B#ca*K>bm$eFfSpv{T@tCE0}dP$I9@PDEJLvz^ln?Nm`1s;*b z3=DjSL74G){)!Z!;6YCp#}Etur+p`dnhbaxg1MWvomi!GqVMm2e-nqa9IL*0vhn;k z<8C$mJXFuc@Q!W08Fpgu=C;%Vdl?*|uWHFE;ZVDP-!R(xO4 z<`bXzl)gnC+N;cR9A5^@9PbRvbdxgTe~DWM4f)9Aw0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/toys.rsi/griffinprize.png b/Resources/Textures/Objects/Fun/figurines.rsi/griffinprize.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/griffinprize.png rename to Resources/Textures/Objects/Fun/figurines.rsi/griffinprize.png diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/librarian.png b/Resources/Textures/Objects/Fun/figurines.rsi/librarian.png new file mode 100644 index 0000000000000000000000000000000000000000..ab920754e53638d7e607bae1fd94660c8ef68f25 GIT binary patch literal 403 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim50(?STf%N`t<9c@`!Ah1DF}m$uDh%-=h7t^)KY!jI;49vwbmt<2gM&jv zL_}(8YP1P|U0vP(|NqymS;NcATi~EIIox_Oj<$o|LE;Zl2C#pT} Tmc|UAn;AS^{an^LB{Ts5<|(Fv literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/medical.png b/Resources/Textures/Objects/Fun/figurines.rsi/medical.png new file mode 100644 index 0000000000000000000000000000000000000000..3e0a3d0b382bf3a4181ecf7684a279d0545f0128 GIT binary patch literal 416 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijA1AIbUJ$1Rt%gg`Yy8sjjxP9vXySukH&GlV6@$1FIFZQkK?VEh$$dUj5 z|I2BYWM^la+MYBrSrHl4nJ@ErzW#^d=bQhEX0#mvJToEZsjHeB09cXGSEI9wp_q@U@``PjnmvyFevsne(Q3Q8;2=)5^0 iot$2AP@hB7meH{=K6BEp`!j%!XYh3Ob6Mw<&;$U|!L^J4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/meta.json b/Resources/Textures/Objects/Fun/figurines.rsi/meta.json new file mode 100644 index 0000000000..d7560893c7 --- /dev/null +++ b/Resources/Textures/Objects/Fun/figurines.rsi/meta.json @@ -0,0 +1,95 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites made by Flareguy for Space Station 14. Griffinprize, skeletonprize, and owlprize taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Figurine_spawner sprite made using parts found in spawner_icons.dmi from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "atmos" + }, + { + "name": "engineer" + }, + { + "name": "passenger" + }, + { + "name": "passenger_greytide" + }, + { + "name": "captain" + }, + { + "name": "cargotech" + }, + { + "name": "qm" + }, + { + "name": "salvage" + }, + { + "name": "nukie" + }, + { + "name": "nukie_elite" + }, + { + "name": "nukie_commander" + }, + { + "name": "footsoldier" + }, + { + "name": "scientist" + }, + { + "name": "medical" + }, + { + "name": "queen" + }, + { + "name": "security" + }, + { + "name": "clown" + }, + { + "name": "mime" + }, + { + "name": "librarian" + }, + { + "name": "slime" + }, + { + "name": "wizard" + }, + { + "name": "wizard_fake" + }, + { + "name": "owlprize" + }, + { + "name": "griffinprize" + }, + { + "name": "skeletonprize" + }, + { + "name": "fig_box" + }, + { + "name": "fig_box_unfolded" + }, + { + "name": "figurine_spawner" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/mime.png b/Resources/Textures/Objects/Fun/figurines.rsi/mime.png new file mode 100644 index 0000000000000000000000000000000000000000..30135ef80db601c984eb70be69d84a17e63cfa47 GIT binary patch literal 395 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilQ1AIbU(-;`~85kNE7_1o>v>6z@fZ_}c|Ns9#aNs~gLxb^5hK!61PfyRS zTeh4yal*#Nrmn7T-I_JLyu1YtT9d=AH|BcouM9cU77Nt%zU!(5kdiD3@(Tu zns99gD&j2gh%9Dc;5!V$jK}j=qyPn%c)B=-Soq)VyDijYz~jRB+HJ`lorM4Yy?qnY zb1oeGIQ4RS+T_bV-9MUxxsD!ZzO8YpX#I?cF!ARy%!W>-tq;PCb0ro|+da?OQNi8G zsH|AqM6Mx!hFQ_V#_POt$4<0{weNC_dNws?Lf+jAoS(aXI!CLXVbXS4z#cK#o>g{n zx^Iuci60WF3AawP2plpw|9OeIb?5d4m!HmzxRU6FVdQ&MBb@0Fe=(O#lD@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/nukie.png b/Resources/Textures/Objects/Fun/figurines.rsi/nukie.png new file mode 100644 index 0000000000000000000000000000000000000000..bafd4c1c96d468623bd997abbd94226de92deb05 GIT binary patch literal 413 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij=0(?STJsmAflvF}3Z8BZmlbD(7)wLV`H?)^!zEYK1udV&x-dPt%5zJ~<==1bOqloCk#FTg?!U?j5)7NHr5X;26)-K(&R=@iB=-`7)$0#D zJE|Icb=Q16bJbQ-@_}ZHL)<4VOQ{vvSxL@c4Z|6BTsUU7B8FM^s9I3@nNoHKB`1%| zYODs|`s4l^vFqFjb|_Q59dt?d&j*=5*ZCe>_r151J-J}j(#4EsZ}vWCTfJ-2G^Q)t?zHyZ{u{%na=-oF>YpFQ7joZu^Ss?TDs7wk zc8>-=$9t+=0&X21AVXs6_AyI6s*r!Y;0T}3WfT3=M$bd7*6(qgx2`|@TF#Q`i_d+~ e+|LkH#dLLX((>&$l;wa9XYh3Ob6Mw<&;$TNIjyh& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/nukie_elite.png b/Resources/Textures/Objects/Fun/figurines.rsi/nukie_elite.png new file mode 100644 index 0000000000000000000000000000000000000000..640bb592e00f2234e5a806e68777dce19d81718d GIT binary patch literal 438 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijQ0(?ST6%-W2#l_9c%#@UrOiWCG!qU>x{}~w4fGpJ(2E(;{e0=Ka>VbiQ znwpx~+1d8?_T>x=;S3CYeSJDQI@$dE0UR6x0s?k+cD%g21rA!1!>u>wdhV|bInx#k zG~=FP`x+pnP!i-9{2xDHh>4MY3slQl;1OBOz`%DHgc*46*QkI^j0o zAqAec_BFF7AG#oW*YVze-M3D?uaiE++3RKeu2)Y}_`D;$J zGU)!gmAw1>Q~3oBN3O_a2)^3Tw)nw|g0mhAUoU*WBdx`t=iR$wjk{0y%~+NhH!XG9 uY<21U#!Fu}Zk%-3*y-Ox=KTsSA6Sk`6dqcT3T8+Z{D=Gx38*ze4CaF z-sd+Zof7}&c_(&Kx_Vtbgq&Qaqjr}H`ATU-6aoq+CS@O1TaS?83{1OWIPq0ayS literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/passenger_greytide.png b/Resources/Textures/Objects/Fun/figurines.rsi/passenger_greytide.png new file mode 100644 index 0000000000000000000000000000000000000000..8a636bc2b39c9225412d2e601fcc21593a9ed485 GIT binary patch literal 423 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil00(?STZES3W_J_@!IWy>7>yaZzy1Toxva%W)8a8jC=yR zue>m0?f*{bm$eFfS zpz+x%$L9elxso8iV4yPGfZ>gVOdL=pXMsm#F#`kNVGw3Kp1&dmD7ePc#WBRf|84(8 zz9s`6SL+KK^E4JTB%k>If0=CdBdgwh(&wFal`TKXx=sI2tBWGT6zNUup(~48U-Mnz z3W0@*&_X4wx-&1df~b-@5?h-QG0!>&3$__N~gw%Gy1_X+g2}=FOX@PoI9^z<~@u zRV^(oPfyRAH*eb8+t=0A{r~@e-I_I#x{L)5T9d=AH|BcouM9cU77H|I_ivHqKuWqK z$S)YE3 zG4jp-`W2cf$Knbq%WP^h@`}`ir|$bO|IkH!Yps<%DvXb;?n`cP)Kt19sd1t6KD*;* zCZ)e&35VzKo(o*D#`s*=Br~stpU$;)e@>Xv^z9;>^xkQEg1Ax^aqCT*xQEI7#jecR zQeq1Zgjei&pukcW#H|ry9K@|q^0z?xm)|8f#h%9&XFuC~)Sr7M_`%Df^Ez)l`VUIS dePDL-;@2yP`<@}D`UU8422WQ%mvv4FO#ms(uo(aV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/queen.png b/Resources/Textures/Objects/Fun/figurines.rsi/queen.png new file mode 100644 index 0000000000000000000000000000000000000000..d46765b3e61f272bad0aaa89e16e50864e8f0edb GIT binary patch literal 489 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikF1AIbU#Ra*8-AtU#HB7bT)#b&6?F6)SY%DCi~GH*U5qIR)TCNRBmy+TT!=&5oJ zo?6%OK@!4q8D8?I_hcMYB1?Q&-qpTfi)i~dfn%L-F7&EYlOE9)|0u<(xI-wSFTRU*X5OykkZ=gKV3isPTr@M7DcT()SN09jswhPWiRJ zMczm>;)mg`S^@dSaBp3nrkkAX8`{D*3QICd2s2D~oG-ZIJ%f%(#=qMF4;_AR+K+dnZLX!%{^=x-FQ&iBCi><4GQulx;B^$b0{?kuw{53>P-iow&>&t;uc GLK6V1!nv3L literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/salvage.png b/Resources/Textures/Objects/Fun/figurines.rsi/salvage.png new file mode 100644 index 0000000000000000000000000000000000000000..005742dd7db98069a49e4c55eb26ef9c43e007a7 GIT binary patch literal 446 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilm0(?STjkGmvY;075tfTx~`nUHN%`8@uk;`G%9*f1V0BIg5!a*;3czU{h<4UFr+z3_rHzteS7;EZx5$?|h{j7yEN( z$vxf2h08fK=d9kv*)es_Yjc-9F(1XA#&C0<7Mhst#=UUiQPah&^~-@I%l&Kn^0q3r ztb6?{QKIVBPUDY48CG^`ZbduXUzqQC$lfw#UgFM*;OXk;vd$@?2>|mL Bx}g97 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/scientist.png b/Resources/Textures/Objects/Fun/figurines.rsi/scientist.png new file mode 100644 index 0000000000000000000000000000000000000000..71d5cfea09bc0b6919e11bd460505d65ce6bf8b5 GIT binary patch literal 395 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikF1AIbUf%IZui3Aej7U^XkQm0tc%nlNi;h(3@KFA4Gs2I|5B7@j#iivud* zEbxddW?3 Oo59o7&t;ucLK6VxccRSz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/security.png b/Resources/Textures/Objects/Fun/figurines.rsi/security.png new file mode 100644 index 0000000000000000000000000000000000000000..e3a91c6aada2f7fce11948db14f783fc7ae367fa GIT binary patch literal 470 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil`1AIbU6%~}yQWHah1N8L_og7^vs(bbq%jTNrInYLH(yIHMqcGWqLHnQO=M(bOmwuTySt-y5dd`zu4vw8aALR9U*>0+3QI3Gxg6PXu7FKkwuZ)WBKb5n0T@z;_sg z8IR|$NC67&_jGX#vGBj!cT=dzfQNxuS4l`GWa8qYTmS#Nai_RlD*SNwt@Esu%WQA> z{{=C8P_N)~l=z`667Jxk*=p`w$hzdWlN^W8qF|Oun|ReYI?fw%oHE<q4mL*b@{uF8J8V0;CXD~ySO_f@(0H{>-}PB&jZdLEdO!Hp5xj+ Z#%&K<8)f|++JIhR@O1TaS?83{1OVov!w&!e literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/toys.rsi/skeletonprize.png b/Resources/Textures/Objects/Fun/figurines.rsi/skeletonprize.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/skeletonprize.png rename to Resources/Textures/Objects/Fun/figurines.rsi/skeletonprize.png diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/slime.png b/Resources/Textures/Objects/Fun/figurines.rsi/slime.png new file mode 100644 index 0000000000000000000000000000000000000000..6bf047664beeae60653711782ef17ea65e0780a7 GIT binary patch literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!21ZX8$B+p3x0m?pzF+-SJFmYog zSHF^Bgo;f|s8d8hxB3T;d56>{&hikxDAc^|%dwqaiwoZ?O#2-DZob*yeP-JoI22nZ z)O$bBSbp`!BOQ}jQw!8w*Bwxf$mKiM|Fyet_enPYZ5Jujl2Tn|xB~-M*Q5 zW~*+$_L?f7Eg-z_z{Jfy!g>4jL!AzO)OHQDl{?q8_~D$_5psU59O4fiHQl@&-(TJE zfcwETftAJq5>h)jHYPli%=4)$VB6upKmN-4e@%XCs}5_1e2Ua~UJ}DNqgwjfZsv6i zzfMp6P~4iA^3W#a{1V5@K^3Y`EW|hXKTnsODbzB-o@od3iUTRG6E|O-3Jf6zPgg&e IbxsLQ0E%alod5s; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/wizard.png b/Resources/Textures/Objects/Fun/figurines.rsi/wizard.png new file mode 100644 index 0000000000000000000000000000000000000000..d5ff59a080836902f7853f244f179c6dd79b4411 GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikF1AIbUnf3Cyou=}*&t(rhaC_6-|MxBcWlo+vdF|S@7yDNI|Nq~`OeenY znr7InuNM#ZEIXHAz);|zH96dRW3K1^%8)Z{u|V}-txQ4Ii0HXZgiivp#XiRBd&cF7T*Ru9{oe z$w%|3!pg*!S)VM^^>(?ZyxBFS*zd}#UCS4;e(-SrAo}|;uQQ_$N9v2E2Qw7o7F-bi zdgq=ZL(I!$Rns1Zds83zybf*XKVZ3cL6By`NM~+moLBAx9b1@|BDtaVh=pP<388LOeenY znr7InuNM#B-ZZyo*|`J*h5`qz$>G);b3ON0hMZ}O1?s&dZEXjnBuaw(f`Qtx0fw`} zdarLTimR!vqGW%p*`z^Jx=Ko$>+RN?lf$?HjhX5hID9X!MUp~cXsT~{;}|`(&F-l z@_GLk=i0kzDwKS9!BkYg_prdlz@rPNvjuZ~YxGDxUHO-nvx3Rw^T5EsYHDh5aB%eW^cor(5fKpvQEs~c0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRL zOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DJ4HAM~RCwC9|j)q=$<$ttc@!6~s2=QdV&F za{-$Q02m<|xqj=`GXMYp)=5M`R7l6|lrajzKoCU}*zNTQ20eh{0fNR}#4%CNG0a{h zy^T$np zg(lvmOUqV(<5T8Z8{rfRGyPi(?uWz+xF3k#rw^T5EsYHDh5aB%eW^cor(5fKsj*4dB%0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRL zOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DJ4HAM~RCwC9|j)q=$<$ttc@!6~s2=QdV&F za{-$Q02m<|xqj=`GXMYp)Ja4^R7gwhlrav1Fcd&b0*e#q4G?eO0UE@e7=M1y*&~pi z!1M$h!3Ae8p&ZHq+S2yB5EBP^(@XP`-wyqZ&HM#H;+w@XjR#w;m09E|_spWmxMyP` z08n-TB0wQT*_%XJP6$AVx<3YqS0c!(>cAbd2vHtgvoV9oD=-FnFi=-ui~Fl}%?`Tm z>DtW9H%Ukxv5S=jTQbPGvM?iq!UP2w0QhEs!*6Gis3!)s3Xl%;5(qa98K7PQ`wt^Z sWf2{K3Fv2@^%7_wWN@==r0gNY9(K5Pg-pn6!D)it4S_ip~Km2>1I y=ka7Lvs%ElV}aDc1A8MY%~v%{nq+oZfSDopsL)cb7Y8qcoaO22=d#Wzp$Pz&5J=Jh diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index 7304e6d459..a2e3333451 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -59,9 +59,6 @@ { "name": "plushie_xeno" }, - { - "name": "doll" - }, { "name": "carpplush-inhand-left", "directions": 4 @@ -70,14 +67,6 @@ "name": "carpplush-inhand-right", "directions": 4 }, - { - "name": "doll-inhand-left", - "directions": 4 - }, - { - "name": "doll-inhand-right", - "directions": 4 - }, { "name": "AI" }, @@ -90,15 +79,6 @@ { "name": "bolt-open" }, - { - "name": "deathripleytoy" - }, - { - "name": "durandprize" - }, - { - "name": "fireripleytoy" - }, { "name": "foamblade" }, @@ -108,51 +88,15 @@ { "name": "foamdart" }, - { - "name": "griffinprize" - }, { "name": "foambox" }, - { - "name": "gygaxtoy" - }, - { - "name": "honkprize" - }, { "name": "ian" }, - { - "name": "marauderprize" - }, - { - "name": "maulerprize" - }, { "name": "nuketoy" }, - { - "name": "odysseusprize" - }, - { - "name": "owlprize" - }, - { - "name": "phazonprize" - }, - { - "name": "reticenceprize" - }, - { - "name": "ripleytoy" - }, - { - "name": "seraphprize" - }, - { - "name": "skeletonprize" - }, { "name": "snappop" }, diff --git a/Resources/migration.yml b/Resources/migration.yml index 8f55788d37..fd372c7998 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -105,3 +105,6 @@ ClothingOuterVestKevlar: ClothingOuterArmorBasic # 2023-07-10 Intercom: IntercomCommon + +# 2023-07-12 +ToyAssistant: ToyFigurinePassenger