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 0000000000..1cf2c9b3e8 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/atmos.png differ 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 0000000000..8654715cb6 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/captain.png differ 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 0000000000..732ec53eda Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/cargotech.png differ 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 0000000000..244e1b61ad Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/clown.png differ 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 0000000000..f91b042480 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/engineer.png differ 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 0000000000..2ab3e0e145 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/fig_box.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/fig_box_unfolded.png b/Resources/Textures/Objects/Fun/figurines.rsi/fig_box_unfolded.png new file mode 100644 index 0000000000..b615763dba Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/fig_box_unfolded.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/figurine_spawner.png b/Resources/Textures/Objects/Fun/figurines.rsi/figurine_spawner.png new file mode 100644 index 0000000000..3e4340a148 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/figurine_spawner.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/footsoldier.png b/Resources/Textures/Objects/Fun/figurines.rsi/footsoldier.png new file mode 100644 index 0000000000..4c801a82ff Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/footsoldier.png differ 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 0000000000..ab920754e5 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/librarian.png differ 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 0000000000..3e0a3d0b38 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/medical.png differ 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 0000000000..30135ef80d Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/mime.png differ 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 0000000000..bafd4c1c96 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/nukie.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/nukie_commander.png b/Resources/Textures/Objects/Fun/figurines.rsi/nukie_commander.png new file mode 100644 index 0000000000..544100aa30 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/nukie_commander.png differ 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 0000000000..640bb592e0 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/nukie_elite.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/owlprize.png b/Resources/Textures/Objects/Fun/figurines.rsi/owlprize.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/owlprize.png rename to Resources/Textures/Objects/Fun/figurines.rsi/owlprize.png diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/passenger.png b/Resources/Textures/Objects/Fun/figurines.rsi/passenger.png new file mode 100644 index 0000000000..54ef4c909e Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/passenger.png differ 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 0000000000..8a636bc2b3 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/passenger_greytide.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/qm.png b/Resources/Textures/Objects/Fun/figurines.rsi/qm.png new file mode 100644 index 0000000000..9783be1daf Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/qm.png differ 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 0000000000..d46765b3e6 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/queen.png differ 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 0000000000..005742dd7d Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/salvage.png differ 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 0000000000..71d5cfea09 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/scientist.png differ 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 0000000000..e3a91c6aad Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/security.png differ 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 0000000000..6bf047664b Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/slime.png differ 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 0000000000..d5ff59a080 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/wizard.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/wizard_fake.png b/Resources/Textures/Objects/Fun/figurines.rsi/wizard_fake.png new file mode 100644 index 0000000000..1ae5668a8f Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/wizard_fake.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/deathripleytoy.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/deathripley.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/deathripleytoy.png rename to Resources/Textures/Objects/Fun/mech_figurines.rsi/deathripley.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/durandprize.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/durand.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/durandprize.png rename to Resources/Textures/Objects/Fun/mech_figurines.rsi/durand.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/fireripleytoy.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/fireripley.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/fireripleytoy.png rename to Resources/Textures/Objects/Fun/mech_figurines.rsi/fireripley.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/gygaxtoy.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/gygax.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/gygaxtoy.png rename to Resources/Textures/Objects/Fun/mech_figurines.rsi/gygax.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/honkprize.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/honk.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/honkprize.png rename to Resources/Textures/Objects/Fun/mech_figurines.rsi/honk.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/marauderprize.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/marauder.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/marauderprize.png rename to Resources/Textures/Objects/Fun/mech_figurines.rsi/marauder.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/maulerprize.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/mauler.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/maulerprize.png rename to Resources/Textures/Objects/Fun/mech_figurines.rsi/mauler.png diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/meta.json b/Resources/Textures/Objects/Fun/mech_figurines.rsi/meta.json new file mode 100644 index 0000000000..f92464abc6 --- /dev/null +++ b/Resources/Textures/Objects/Fun/mech_figurines.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "deathripley" + }, + { + "name": "ripley" + }, + { + "name": "fireripley" + }, + { + "name": "marauder" + }, + { + "name": "mauler" + }, + { + "name": "gygax" + }, + { + "name": "durand" + }, + { + "name": "odysseus" + }, + { + "name": "honk" + }, + { + "name": "seraph" + }, + { + "name": "reticence" + }, + { + "name": "phazon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/odysseusprize.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/odysseus.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/odysseusprize.png rename to Resources/Textures/Objects/Fun/mech_figurines.rsi/odysseus.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/phazonprize.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/phazon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/phazonprize.png rename to Resources/Textures/Objects/Fun/mech_figurines.rsi/phazon.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/reticenceprize.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/reticence.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/reticenceprize.png rename to Resources/Textures/Objects/Fun/mech_figurines.rsi/reticence.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/ripleytoy.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/ripley.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/ripleytoy.png rename to Resources/Textures/Objects/Fun/mech_figurines.rsi/ripley.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/seraphprize.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/seraph.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/seraphprize.png rename to Resources/Textures/Objects/Fun/mech_figurines.rsi/seraph.png diff --git a/Resources/Textures/Objects/Fun/toys.rsi/doll-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/doll-inhand-left.png deleted file mode 100644 index 8c50179451..0000000000 Binary files a/Resources/Textures/Objects/Fun/toys.rsi/doll-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/doll-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/doll-inhand-right.png deleted file mode 100644 index 9f8be24419..0000000000 Binary files a/Resources/Textures/Objects/Fun/toys.rsi/doll-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/doll.png b/Resources/Textures/Objects/Fun/toys.rsi/doll.png deleted file mode 100644 index 5dcfc8ff94..0000000000 Binary files a/Resources/Textures/Objects/Fun/toys.rsi/doll.png and /dev/null differ 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