From 80a9a1bd6daf34792a8b73bb2cebe02b72513144 Mon Sep 17 00:00:00 2001 From: Aexxie Date: Tue, 12 Mar 2024 12:03:21 -0500 Subject: [PATCH] adds a fuckton of personal stuff --- .../VendingMachines/Inventories/games.yml | 18 ++ .../_Umbra/Entities/Clothing/Belt/belts.yml | 16 ++ .../Entities/Clothing/OuterClothing/coats.yml | 53 ++++++ .../Clothing/OuterClothing/wintercoats.yml | 11 ++ .../Entities/Markers/Spawners/Random/toy.yml | 80 +++++++++ .../Entities/Objects/Fun/figurine_boxes.yml | 148 +++++++++++++++++ .../_Umbra/Entities/Objects/Fun/figurines.yml | 154 ++++++++++++++++++ .../Weapons/Guns/Revolvers/revolvers.yml | 1 + .../Structures/Machines/vending_machines.yml | 14 ++ .../Belt/moonlit.rsi/equipped-BELT.png | Bin 0 -> 268 bytes .../_Umbra/Clothing/Belt/moonlit.rsi/icon.png | Bin 0 -> 293 bytes .../Clothing/Belt/moonlit.rsi/inhand-left.png | Bin 0 -> 283 bytes .../Belt/moonlit.rsi/inhand-right.png | Bin 0 -> 268 bytes .../Clothing/Belt/moonlit.rsi/meta.json | 26 +++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 1887 bytes .../Coats/coatmoonlit.rsi/icon.png | Bin 0 -> 694 bytes .../Coats/coatmoonlit.rsi/inhand-left.png | Bin 0 -> 635 bytes .../Coats/coatmoonlit.rsi/inhand-right.png | Bin 0 -> 642 bytes .../Coats/coatmoonlit.rsi/meta.json | 26 +++ .../Fun/figurines.rsi/aursai_commander.png | Bin 0 -> 475 bytes .../Objects/Fun/figurines.rsi/brains_rd.png | Bin 0 -> 607 bytes .../Fun/figurines.rsi/deeja_doctor.png | Bin 0 -> 411 bytes .../Fun/figurines.rsi/deeja_salvage.png | Bin 0 -> 454 bytes .../Fun/figurines.rsi/fakesky_passenger.png | Bin 0 -> 415 bytes .../Fun/figurines.rsi/gazes_salvage.png | Bin 0 -> 454 bytes .../Fun/figurines.rsi/kate_commander.png | Bin 0 -> 456 bytes .../Objects/Fun/figurines.rsi/meta.json | 56 +++++++ .../Objects/Fun/figurines.rsi/moon_cmo.png | Bin 0 -> 437 bytes .../Fun/figurines.rsi/nashira_detective.png | Bin 0 -> 425 bytes .../Objects/Fun/figurines.rsi/nebula_rd.png | Bin 0 -> 553 bytes .../Objects/Fun/figurines.rsi/piet_doctor.png | Bin 0 -> 379 bytes .../Objects/Fun/figurines.rsi/sky_doctor.png | Bin 0 -> 407 bytes .../Fun/figurines.rsi/stars_bartender.png | Bin 0 -> 419 bytes .../Fun/figurines.rsi/wipes_janitor.png | Bin 0 -> 441 bytes .../Objects/Fun/figurines.rsi/zack_cargo.png | Bin 0 -> 413 bytes Resources/migration.yml | 23 +-- 36 files changed, 607 insertions(+), 19 deletions(-) create mode 100644 Resources/Prototypes/_Umbra/Catalog/VendingMachines/Inventories/games.yml create mode 100644 Resources/Prototypes/_Umbra/Entities/Clothing/Belt/belts.yml create mode 100644 Resources/Prototypes/_Umbra/Entities/Clothing/OuterClothing/coats.yml create mode 100644 Resources/Prototypes/_Umbra/Entities/Clothing/OuterClothing/wintercoats.yml create mode 100644 Resources/Prototypes/_Umbra/Entities/Markers/Spawners/Random/toy.yml create mode 100644 Resources/Prototypes/_Umbra/Entities/Objects/Fun/figurine_boxes.yml create mode 100644 Resources/Prototypes/_Umbra/Entities/Objects/Fun/figurines.yml create mode 100644 Resources/Prototypes/_Umbra/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml create mode 100644 Resources/Prototypes/_Umbra/Entities/Structures/Machines/vending_machines.yml create mode 100644 Resources/Textures/_Umbra/Clothing/Belt/moonlit.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_Umbra/Clothing/Belt/moonlit.rsi/icon.png create mode 100644 Resources/Textures/_Umbra/Clothing/Belt/moonlit.rsi/inhand-left.png create mode 100644 Resources/Textures/_Umbra/Clothing/Belt/moonlit.rsi/inhand-right.png create mode 100644 Resources/Textures/_Umbra/Clothing/Belt/moonlit.rsi/meta.json create mode 100644 Resources/Textures/_Umbra/Clothing/OuterClothing/Coats/coatmoonlit.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_Umbra/Clothing/OuterClothing/Coats/coatmoonlit.rsi/icon.png create mode 100644 Resources/Textures/_Umbra/Clothing/OuterClothing/Coats/coatmoonlit.rsi/inhand-left.png create mode 100644 Resources/Textures/_Umbra/Clothing/OuterClothing/Coats/coatmoonlit.rsi/inhand-right.png create mode 100644 Resources/Textures/_Umbra/Clothing/OuterClothing/Coats/coatmoonlit.rsi/meta.json create mode 100644 Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/aursai_commander.png create mode 100644 Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/brains_rd.png create mode 100644 Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/deeja_doctor.png create mode 100644 Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/deeja_salvage.png create mode 100644 Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/fakesky_passenger.png create mode 100644 Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/gazes_salvage.png create mode 100644 Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/kate_commander.png create mode 100644 Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/meta.json create mode 100644 Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/moon_cmo.png create mode 100644 Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/nashira_detective.png create mode 100644 Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/nebula_rd.png create mode 100644 Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/piet_doctor.png create mode 100644 Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/sky_doctor.png create mode 100644 Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/stars_bartender.png create mode 100644 Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/wipes_janitor.png create mode 100644 Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/zack_cargo.png diff --git a/Resources/Prototypes/_Umbra/Catalog/VendingMachines/Inventories/games.yml b/Resources/Prototypes/_Umbra/Catalog/VendingMachines/Inventories/games.yml new file mode 100644 index 000000000000..60513c1217b0 --- /dev/null +++ b/Resources/Prototypes/_Umbra/Catalog/VendingMachines/Inventories/games.yml @@ -0,0 +1,18 @@ +- type: vendingMachineInventory + id: GoodCleanFunInventoryUmbra + startingInventory: + DiceBag: 6 + Paper: 8 + d6Dice: 8 + ChessBoard: 1 + BackgammonBoard: 1 + ParchisBoard: 1 + CheckerBoard: 1 + ShipBattlemap: 1 + SnowBattlemap: 1 + SandBattlemap: 1 + MoonBattlemap: 1 + GrassBattlemap: 1 + PaperCNCSheet: 6 + MysteryFigureBoxUmbra: 2 + BooksBag: 3 diff --git a/Resources/Prototypes/_Umbra/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_Umbra/Entities/Clothing/Belt/belts.yml new file mode 100644 index 000000000000..808942defabf --- /dev/null +++ b/Resources/Prototypes/_Umbra/Entities/Clothing/Belt/belts.yml @@ -0,0 +1,16 @@ +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltMoonlitHolster + name: moonlit shoulder holster + description: A robust holster tailored to Aur'sai. + components: + - type: Sprite + sprite: _Umbra/Clothing/Belt/moonlit.rsi + - type: Clothing + sprite: _Umbra/Clothing/Belt/moonlit.rsi + - type: Item + size: Normal + - type: Storage + maxItemSize: Huge + grid: + - 0,0,3,3 diff --git a/Resources/Prototypes/_Umbra/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_Umbra/Entities/Clothing/OuterClothing/coats.yml new file mode 100644 index 000000000000..75b0fc97db9b --- /dev/null +++ b/Resources/Prototypes/_Umbra/Entities/Clothing/OuterClothing/coats.yml @@ -0,0 +1,53 @@ +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatMoonlitBase + name: moonlit coat + description: An elegant coat tailored for Agent Aur'sai. + abstract: true + components: + - type: Sprite + sprite: _Umbra/Clothing/OuterClothing/Coats/coatmoonlit.rsi + - type: Clothing + sprite: _Umbra/Clothing/OuterClothing/Coats/coatmoonlit.rsi + +- type: entity + parent: ClothingOuterCoatMoonlitBase + id: ClothingOuterCoatMoonlitWinter + suffix: Personal, Aexxie, Winter + components: + - type: TemperatureProtection + coefficient: 0.1 + - type: Armor + modifiers: + coefficients: + Slash: 0.95 + Heat: 0.90 + +- type: entity + parent: [ ClothingOuterCoatMoonlitBase, ClothingOuterArmorBasic ] + id: ClothingOuterCoatMoonlitSecurity + suffix: Personal, Aexxie, Security + +- type: entity + parent: [ ClothingOuterCoatMoonlitBase, ClothingOuterCoatHoSTrench ] + id: ClothingOuterCoatMoonlitHoS + suffix: Personal, Aexxie, HoS + +- type: entity + parent: ClothingOuterCoatMoonlitBase + id: ClothingOuterCoatMoonlit + suffix: Personal, Aexxie, CDoS + components: + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.5 + Heat: 0.60 + Caustic: 0.85 + - type: ExplosionResistance + damageCoefficient: 0.65 + - type: Storage + grid: + - 0,0,3,1 diff --git a/Resources/Prototypes/_Umbra/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/_Umbra/Entities/Clothing/OuterClothing/wintercoats.yml new file mode 100644 index 000000000000..61d916f16bd9 --- /dev/null +++ b/Resources/Prototypes/_Umbra/Entities/Clothing/OuterClothing/wintercoats.yml @@ -0,0 +1,11 @@ +- type: entity + parent: ClothingOuterWinterCoat + id: FrostCoat + name: Frosty Winter Coat + description: A delicate, precisely made winter coat with a small label that says "Frostbite-Drago", it seems to be covered in a light layer of frost. + suffix: Personal, Frost, Winter + components: + - type: Sprite + sprite: _Umbra/Clothing/OuterClothing/WinterCoats/frostcoat.rsi + - type: Clothing + sprite: _Umbra/Clothing/OuterClothing/WinterCoats/frostcoat.rsi diff --git a/Resources/Prototypes/_Umbra/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/_Umbra/Entities/Markers/Spawners/Random/toy.yml new file mode 100644 index 000000000000..92b9003eede8 --- /dev/null +++ b/Resources/Prototypes/_Umbra/Entities/Markers/Spawners/Random/toy.yml @@ -0,0 +1,80 @@ +- type: entity + name: Spacemen Minifigure Spawner + suffix: Umbra + id: SpacemenFigureSpawnerUmbra + 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 + - ToyFigurineMusician + - ToyFigurineBoxer + - ToyFigurineCaptain + - ToyFigurineHeadOfSecurity + - ToyFigurineWarden + - ToyFigurineDetective + - ToyFigurineSecurity + - ToyFigurineLawyer + - ToyFigurineCargoTech + - ToyFigurineSalvage + - ToyFigurineQuartermaster + - ToyFigurineChiefEngineer + - ToyFigurineAtmosTech + - ToyFigurineEngineer + - ToyFigurineResearchDirector + - ToyFigurineScientist + - ToyFigurineChiefMedicalOfficer + - ToyFigurineChemist + - ToyFigurineParamedic + - ToyFigurineMedicalDoctor + - ToyFigurineHeadOfPersonnel + - ToyFigurineLibrarian + - ToyFigurineChaplain + - ToyFigurineChef + - ToyFigurineBartender + - ToyFigurineBotanist + - ToyFigurineJanitor + - ToyFigurineNukie + - ToyFigurineNukieElite + - ToyFigurineFootsoldier + - ToyFigurineWizardFake + - ToyFigurineSlime + - ToyFigurineGreytider + - ToyFigurineWizard + - ToyFigurineNukieCommander + - ToyGriffin + - ToyOwlman + - ToySkeleton + - ToyFigurineRatKing + - ToyFigurineRatServant + - ToyFigurineMouse + - ToyFigurineQueen + - ToyFigurineSpaceDragon + - ToyFigurineHamlet + - ToyFigurineUmbraAursaiCommander + - ToyFigurineUmbraBrainsRD + - ToyFigurineUmbraDeejaMD + - ToyFigurineUmbraDeejaSalvage + - ToyFigurineUmbraFakeskyPassenger + - ToyFigurineUmbraGazesSalvage + - ToyFigurineUmbraKateCommander + - ToyFigurineUmbraMoonCMO + - ToyFigurineUmbraNashiraDetective + - ToyFigurineUmbraNebulaRD + - ToyFigurineUmbraPietMD + - ToyFigurineUmbraSkyMD + - ToyFigurineUmbraStarsBartender + - ToyFigurineUmbraWipesJanitor + - ToyFigurineUmbraZackCargo + chance: 0.90 + offset: 0.2 diff --git a/Resources/Prototypes/_Umbra/Entities/Objects/Fun/figurine_boxes.yml b/Resources/Prototypes/_Umbra/Entities/Objects/Fun/figurine_boxes.yml new file mode 100644 index 000000000000..bcbe3c955d59 --- /dev/null +++ b/Resources/Prototypes/_Umbra/Entities/Objects/Fun/figurine_boxes.yml @@ -0,0 +1,148 @@ +- type: entity + parent: PresentRandom + id: MysteryFigureBoxUmbra + 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: ToyFigurineMusician + orGroup: SpacemenFig + - id: ToyFigurineBoxer + orGroup: SpacemenFig + - id: ToyFigurineCaptain + orGroup: SpacemenFig + - id: ToyFigurineHeadOfSecurity + orGroup: SpacemenFig + - id: ToyFigurineWarden + orGroup: SpacemenFig + - id: ToyFigurineDetective + orGroup: SpacemenFig + - id: ToyFigurineSecurity + orGroup: SpacemenFig + - id: ToyFigurineLawyer + orGroup: SpacemenFig + - id: ToyFigurineCargoTech + orGroup: SpacemenFig + - id: ToyFigurineSalvage + orGroup: SpacemenFig + - id: ToyFigurineQuartermaster + orGroup: SpacemenFig + - id: ToyFigurineChiefEngineer + orGroup: SpacemenFig + - id: ToyFigurineAtmosTech + orGroup: SpacemenFig + - id: ToyFigurineEngineer + orGroup: SpacemenFig + - id: ToyFigurineResearchDirector + orGroup: SpacemenFig + - id: ToyFigurineScientist + orGroup: SpacemenFig + - id: ToyFigurineChiefMedicalOfficer + orGroup: SpacemenFig + - id: ToyFigurineChemist + orGroup: SpacemenFig + - id: ToyFigurineParamedic + orGroup: SpacemenFig + - id: ToyFigurineMedicalDoctor + orGroup: SpacemenFig + - id: ToyFigurineHeadOfPersonnel + orGroup: SpacemenFig + - id: ToyFigurineLibrarian + orGroup: SpacemenFig + - id: ToyFigurineChaplain + orGroup: SpacemenFig + - id: ToyFigurineChef + orGroup: SpacemenFig + - id: ToyFigurineBartender + orGroup: SpacemenFig + - id: ToyFigurineBotanist + orGroup: SpacemenFig + - id: ToyFigurineJanitor + 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: ToyFigurineRatKing + prob: 0.30 + orGroup: SpacemenFig + - id: ToyFigurineRatServant + prob: 0.40 + orGroup: SpacemenFig + - id: ToyFigurineMouse + prob: 0.50 + orGroup: SpacemenFig + - id: ToyFigurineQueen + prob: 0.25 + orGroup: SpacemenFig + - id: ToyFigurineSpaceDragon + prob: 0.10 + orGroup: SpacemenFig + - id: ToyFigurineHamlet + prob: 0.20 + orGroup: SpacemenFig + - id: ToyFigurineUmbraAursaiCommander + orGroup: SpacemenFig + - id: ToyFigurineUmbraBrainsRD + orGroup: SpacemenFig + - id: ToyFigurineUmbraDeejaMD + orGroup: SpacemenFig + - id: ToyFigurineUmbraDeejaSalvage + orGroup: SpacemenFig + - id: ToyFigurineUmbraFakeskyPassenger + orGroup: SpacemenFig + - id: ToyFigurineUmbraGazesSalvage + orGroup: SpacemenFig + - id: ToyFigurineUmbraKateCommander + orGroup: SpacemenFig + - id: ToyFigurineUmbraMoonCMO + orGroup: SpacemenFig + - id: ToyFigurineUmbraNashiraDetective + orGroup: SpacemenFig + - id: ToyFigurineUmbraNebulaRD + orGroup: SpacemenFig + - id: ToyFigurineUmbraPietMD + orGroup: SpacemenFig + - id: ToyFigurineUmbraSkyMD + orGroup: SpacemenFig + - id: ToyFigurineUmbraStarsBartender + orGroup: SpacemenFig + - id: ToyFigurineUmbraWipesJanitor + orGroup: SpacemenFig + - id: ToyFigurineUmbraZackCargo + orGroup: SpacemenFig diff --git a/Resources/Prototypes/_Umbra/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/_Umbra/Entities/Objects/Fun/figurines.yml new file mode 100644 index 000000000000..202d0fe3962b --- /dev/null +++ b/Resources/Prototypes/_Umbra/Entities/Objects/Fun/figurines.yml @@ -0,0 +1,154 @@ +- type: entity + parent: BaseItem + id: BaseFigurineUmbra + name: figurine + description: Probably not to scale. + abstract: true + components: + - type: Sprite + sprite: _Umbra/Objects/Fun/figurines.rsi + - type: PhysicalComposition + materialComposition: + Plastic: 100 + - type: StaticPrice + price: 150 + - type: Tag + tags: + - Figurine + - type: StealTarget + stealGroup: Figurines + +- type: entity + parent: BaseFigurineUmbra + id: ToyFigurineUmbraAursaiCommander + name: aur'sai figurine + suffix: Aur'sai, Commander + components: + - type: Sprite + state: aursai_commander + +- type: entity + parent: BaseFigurineUmbra + id: ToyFigurineUmbraBrainsRD + name: borgs-the-brains figurine + suffix: Borgs-the-Brains, RD + components: + - type: Sprite + state: brains_rd + +- type: entity + parent: BaseFigurineUmbra + id: ToyFigurineUmbraDeejaMD + name: deeja-wujeeta figurine + suffix: Deeja-Wujeeta, MD + components: + - type: Sprite + state: deeja_doctor + +- type: entity + parent: BaseFigurineUmbra + id: ToyFigurineUmbraDeejaSalvage + name: deeja-wujeeta figurine + suffix: Deeja-Wujeeta, Salvage + components: + - type: Sprite + state: deeja_salvage + +- type: entity + parent: BaseFigurineUmbra + id: ToyFigurineUmbraFakeskyPassenger + name: fake sky tomson figurine + suffix: Sky Tomson, Fake, Passenger + components: + - type: Sprite + state: fakesky_passenger + +- type: entity + parent: BaseFigurineUmbra + id: ToyFigurineUmbraGazesSalvage + name: gazes-the-galaxy figurine + suffix: Gazes-the-Galaxy, Salvage + components: + - type: Sprite + state: gazes_salvage + +- type: entity + parent: BaseFigurineUmbra + id: ToyFigurineUmbraKateCommander + name: kate figurine + suffix: Kate, Commander + components: + - type: Sprite + state: kate_commander + +- type: entity + parent: BaseFigurineUmbra + id: ToyFigurineUmbraMoonCMO + name: moonlight galileo figurine + suffix: Moonlight Galileo, CMO + components: + - type: Sprite + state: moon_cmo + +- type: entity + parent: BaseFigurineUmbra + id: ToyFigurineUmbraNashiraDetective + name: nashira figurine + suffix: Nashira, Detective + components: + - type: Sprite + state: nashira_detective + +- type: entity + parent: BaseFigurineUmbra + id: ToyFigurineUmbraNebulaRD + name: nebula-niimina figurine + suffix: Nebula-Niimina, RD + components: + - type: Sprite + state: nebula_rd + +- type: entity + parent: BaseFigurineUmbra + id: ToyFigurineUmbraPietMD + name: piet fuchs figurine + suffix: Piet Fuchs, MD + components: + - type: Sprite + state: piet_doctor + +- type: entity + parent: BaseFigurineUmbra + id: ToyFigurineUmbraSkyMD + name: sky tomson figurine + suffix: Sky Tomson, MD + components: + - type: Sprite + state: sky_doctor + +- type: entity + parent: BaseFigurineUmbra + id: ToyFigurineUmbraStarsBartender + name: stares-at-stars figurine + suffix: Stares-at-Stars, Bartender + components: + - type: Sprite + state: stars_bartender + +- type: entity + parent: BaseFigurineUmbra + id: ToyFigurineUmbraWipesJanitor + name: wipes-the-floor figurine + suffix: Wipes-the-Floor, Janitor + components: + - type: Sprite + state: wipes_janitor + +- type: entity + parent: BaseFigurineUmbra + id: ToyFigurineUmbraZackCargo + name: zack ohminch figurine + suffix: Zack Ohminch, Cargo + components: + - type: Sprite + state: zack_cargo diff --git a/Resources/Prototypes/_Umbra/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_Umbra/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml new file mode 100644 index 000000000000..4ff979e00af3 --- /dev/null +++ b/Resources/Prototypes/_Umbra/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -0,0 +1 @@ +# I lost the fucking file, ill add it later :( diff --git a/Resources/Prototypes/_Umbra/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_Umbra/Entities/Structures/Machines/vending_machines.yml new file mode 100644 index 000000000000..b6bac8cfbdd1 --- /dev/null +++ b/Resources/Prototypes/_Umbra/Entities/Structures/Machines/vending_machines.yml @@ -0,0 +1,14 @@ +- type: entity + parent: VendingMachineGames + id: VendingMachineGamesUmbra + name: Good Clean Fun + suffix: Umbra + description: Vends things that the Captain and Head of Personnel are probably not going to appreciate you fiddling with instead of your job... + components: + - type: VendingMachine + pack: GoodCleanFunInventoryUmbra + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + ejectDelay: 1.8 diff --git a/Resources/Textures/_Umbra/Clothing/Belt/moonlit.rsi/equipped-BELT.png b/Resources/Textures/_Umbra/Clothing/Belt/moonlit.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..63cc4160015dc25a6e27ba2bd738bb088a0c033c GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|j(NH`hE&XX zd&`ll#ekv|pW z?6tbujxKK5xkoRVRlWC~zwf(Ue?|MPRV^zFqNfPRDwX_yF?)Z@lN(Q;>E~5utxf*A zy>41ZPt@yaH-V;r!Hpx9#TVb_ID{_0=JC4T;E}Bcr|g+Kx$}0iOcqvJRrSuwsQ76p zQ>uKK>I}I_r#hGxF-KJY%37j#;E{vNEv9$>9K1E}1p-ZK=-GE}l1tcOqn)oo=6bsN KxvXPx#-$_J4R9J=Wl(7+mFbqY%b7@sjvw&C7{sk*&0oN)#fYJmG90x<}3(1{d;_mNs41vW&-K}fsEy=UWQkf zt(kPaV?p_+cd{2O)s-d{S+{I(S#$d9tWArT)qVS+dcl_Q-tQ^yXRGt2_Ws$sN-cZM zq<7U0J%LUf$G=~^@^aorFS-3Ja`jv?|KnE{-`nbcxqM~?#CQgVJ2SRc+=`Kuiru<4 z@uhb#Q`oP{)w)^D)4BqKnaZ>Ra}AkwJPy3!`?6rw%F^U@`{XxV=2S3x&~)T#*{uo7 Ze=u+~d+7-+UQ`1z&ePS;Wt~$(69ATybF=^e literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Umbra/Clothing/Belt/moonlit.rsi/inhand-right.png b/Resources/Textures/_Umbra/Clothing/Belt/moonlit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c616a775ff026fbe3a8d397b32a51d845781e91d GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|j(NH`hE&XX zd+Q+YVFjMn#O1HVat_Gd`~Qr0MzdVdl5ML37CmBn^50reaiKcmG>d3>)nF>lTIg7gZ!5 z**x>r#bP0l+XkKUP*T5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Umbra/Clothing/Belt/moonlit.rsi/meta.json b/Resources/Textures/_Umbra/Clothing/Belt/moonlit.rsi/meta.json new file mode 100644 index 000000000000..a72eab8ffc1c --- /dev/null +++ b/Resources/Textures/_Umbra/Clothing/Belt/moonlit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "equipped-BELT sprited by Aexxie (Discord), everything else edited and taken from tgstation at commit https://github.com/tgstation/tgstation/commit/94daddb1ac6625e2a7f7a88d62235ee44a480b5e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Umbra/Clothing/OuterClothing/Coats/coatmoonlit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Umbra/Clothing/OuterClothing/Coats/coatmoonlit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..218834034923672b56a2cb0a9ffd1f7acdd2ef77 GIT binary patch literal 1887 zcmV-l2cYPx+8A(JzRCt{2non#SRUXH`lREY^9ZzP{v70)7nz&5_gw<+Yq?8m80)^58TBX_^ zswz3IRMAxhZO~pgaanC~R|rZaj+j3Oq*kbhh$2u96x1GqkTwgnbW zamMBjGcWbGb@#BOmS78G6YQHO|H2l=CRkESux;HvuJj$XRyH-x{`AbJP!tsaP^J|; zN4MeG5AVgP$3DluKrGe=(=1u} zs@jQcb`bz@>fjbUJ~r%F-%+86t}`yGs-4K?^XTpEwemBW47#IHD?giEM8PoDtpS?# z1HoWRnOe09(=4G(D_E^n9P77mP)aRBwvR*`%55KsTEdi4Or<4U9)1`} zEpbPqAgLwT<>7~0^zHK>08F#wTK~55B&;Y*mSs>%u|kN%(~6>k5EGPAG^g$5c-n0P z@Ol8CU>FVh&Diz%@OPqr+Y#{PnFo=-un(_JZWS{8)yb{MU)YB)&pasfyPwlPb#O~d z9wDanG;`|U7RUNRy|Y(}u>+mm810MT(qaLJUfzng|Nf1YK3mG+BFlPq5PE9U0DCmt zW$AHvdUj_ha4_gbcaNS$u=n{lfj5GgFnGGehlE3H2AE_6K# zRqeF){}n<+suaTB_|5P}5!H9R4MudGagnLCg!>m)0RZ!E~e_F}|{lK1i1?OQnt=2KJEJIa0ahgSO_UhN@kvpus zC0fRTp&fWyt*-?l)4*{9%x*Ri#~&IF9UPuk)lSTAHUJNnfq&Hcv2>-3$?mHlirKIb z5@O=qN);2iAbR9}92e*S$3w+_xB*}tIQRhtsP~drI{{x?6h&?MAmZNwydy+D#2hbz zKB*UN`?B;*b4kENX+$A_!p3-sS(}Bf$$+2$5u2W`xv-Kksoq6?pH9jy}&0 zEnZ>YW($TPHK%_at9*QXe0+R-e0+R-erpJQJRFgCv0ZZg>x;Xh58St-;jVroSs0sO zXaDm(j!P;zlOFz z2sd*}o=%5t-92ozRzd&3PAnS*D_(&IXc$Ib$SLC3B^Fi`7LO01OOF5mI^+;?`8>+B zg7e4f{`u8fMf81yS*=x|C@Rh$Q&FashL`WsBZ$X`ggjG@8$gz2%NNHRp-f8XkVDvi z(!j+RcA_m15`7vK5=D$8|+%c_l$rL6H{pkr&$z7i<(ef zju#92-Jq&=;>6x%oH$oQZ*MQs*RNTZmR>t1xgCU<=pWdLOeTXDCjxl!VwdF}7qP>! zTbxpgSga2-(>k_~L?I>K3&gNt!$Zu(^lWjrlzGpEO_?YhT~p z5n)APg9GuF)itRl*hhcd$C6sYvmi-3Z0<0#Yc}T(4#b(rF5q|s{Is{WRQ!ro#9N_u zENev^n)jgPo47HbZ_q@sF<2?dcQv$&tRJ9Y_9?{+hT$}@BSw^ru)N(^RkqhFlL~ILk!=7&yOyvHr z%Nrrs9uhhLS-*E{NFW%*OO^TyUs^0+3BVhHoZIRgGrQTqP^}kJX$hl!b^T+ZBJjPt z9Y|=nJhf?n4YkWwbjE9u?@_%~KmTt;lo-$&DHd!G;ctb_0P2wPx%a7jc#R9J=Wl(BEqP!PsHmktKGu2G)dByCU<36^#;LsTNhkcj~{6g7VVOekY_ z7Eeg+ACQ5K4jm#obpfdinW#iT6(}iIm6%eyPtmIcJqBdc0BYVtMFNrE_I&62PT%Pc z7&B(f|Bj}T>{%|AayDkCE}`&ZE&2D|jXU(=Xn?J59}f@PN;RdSc8&aIg$ns1d6r9l zvqAviH!I{>E*0`c@|zW+c8$(m+;3LMW{e8?A{FvQnn}-+XSqb}8hMsWGwInRW;2#F zCxet-He-~{<`6|8OmiChy&mS~=92i{-X7A9lf-?$i+&JD)t*ohABbbL8VqU2!9mc+ zo7dYo2>M7n4q6R{fjCAKg~(=euo;tbVPpd_oJSb&5as1vv>I$E)@m@6mv=GXAvlj@ zOO9^9vs_xsTt~g5K?spFl9_jg@-p*IA}oYJy`$mfwVUuPcccqv&S}apNZ0j58~}7( zhhdoDJc1D7r}ybRAq0*%KU3pO2X&oK&~q& z3K0Z7Fy_ECrvX4||6`=r&}NJb!vp}-I~o?cCjfwj?g{FhZ<>Z-O7DNnq)PJrLkp!T z8%x$(1fK)wx{gf*cx6qXNmsFTsNvD1+8vO#>-L2_b>=Sv_-=o^YNy9=W&0D>zr2^O zD?NhEi$Nm(uL7ytkO07*qoM6N<$g7cs^-v9sr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Umbra/Clothing/OuterClothing/Coats/coatmoonlit.rsi/inhand-left.png b/Resources/Textures/_Umbra/Clothing/OuterClothing/Coats/coatmoonlit.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..fe467a481a15c94d5cf1d1abe2f65d50b82db721 GIT binary patch literal 635 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>U^4Y|aSW-L z^Y+%ptlI%1Y!B|o>YUm7=wVclu2hcWbdj7Vy3y11Vwqx{KeOERnx`~F=PdV<>SKDb zUeogUBxfyspvbs=i=<3qkIh^^KEGExw$`Xb{jfJMWBcpAPfUDaF@q8eoLZID^C$mj z|CXjd3L@Ei@B3ZiKjfoc`+vtO!=$y-E#E6@aR+P<)AEy?T*8&T_xAh03RAj*-R|C+ z>Q^<*{D1P=uLhpWPfXh0b4%1fPTj)#1`|Wct&Lk|O`Ic}lW602?Nqj@^2;sBj18rq zibA)Ctvc2r-=g$47AQ3F-?|@;8llN5r$rac-0tJ4obuyet4-ZA#fqPtqRV-%-*uRD zCt;G`$G?Y*Ykq%X?!7Mmf7i6KxWuZhKz$XzUtQgm{WthlW%r7;Nq3_%P3AE$ur;sm zShSp>;o%1^`}OO?*Dap=U0|!P07KuA!}n4-`yMB}-_)Y~@n20qBS=@u`fF3mw_cnZ zdrLw*-_3N7>{pPE>AP1M8tvwsRe!$f`?9(2E^tt(`Re3aH`%MlI3~o)|F>IP$#Ru7 z!&Ld?>VA9wVmZfB#+Y(u2gBMLpu|>?1Y^U&lV*?paxckTCAv3Y*0PT8`UVy^k6D#o z{oe56YC3~M(XQstha;@z7z*knlr8V>3|`-{%lqlw!D#h#!Oic`) Lu6{1-oD!MPx%JV``BRCt{2+A(X}Koke?zq?qNv!mgBQY{*6L6;P40cK#JQ)y`++gY*1bPZXCZtCFvb{T zj4{R-V~jDzvebnj(;1d2lJ7;<2afA43|1F{q*RZNmxbecB&B-PgjIP{8_<-JYF2gO zWGNM<@eDPqil&sMYQjA4G@e09b${G(JzAAFa|T3Fi1WiOblN`kx&Z;e`Qa9#DAXEW zmw8?Q=ye0?w0$a^w<#sng&@cEh=zOA>jp%_J#t)+>OxQ%XF$=sm9&H7FFW+|je`5` zJ8D)Hjm8GT@D9^>hCg55;`h(LXnpvWdaem;%R8|9)+a92x23uIb4BxJ-UI>Qm=yM}DzGdI`&ShllUnw5eCr>q5}{q2l3tS)T@#DPKVI;}ao`I~je;uCO08@Jgl578+wy(8Lt{Grz&%ndA|3+g&>)5#(5XUisgG-D~ zw*dg7(`^I?mx$w7Yp7LqbN2LsKb`DH?)pDy8~^|S07*qoM6N<$g6nfNK>z>% literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Umbra/Clothing/OuterClothing/Coats/coatmoonlit.rsi/meta.json b/Resources/Textures/_Umbra/Clothing/OuterClothing/Coats/coatmoonlit.rsi/meta.json new file mode 100644 index 000000000000..2d8d9d7d3f9b --- /dev/null +++ b/Resources/Textures/_Umbra/Clothing/OuterClothing/Coats/coatmoonlit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Aexxie (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/aursai_commander.png b/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/aursai_commander.png new file mode 100644 index 0000000000000000000000000000000000000000..5561a57d591f89adca04f5b2bce494cdc83df1c7 GIT binary patch literal 475 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik*1AIbUg@h$U#H2Vld8?#!)HL*^WE9`o#{So>_-|q&CLzPeFC;7?2?Tn2 zdeRaS*EcZyziz6isJLz&gO-+-in3~qyh^Qx4lgfnb7P~KnVGDtY=MK;O>_%)r2R7=#&*=dVZs3SRMaaSXBW zzuWhk?~nqIn{I%J%!`t^vZ>$ey{vO&Ox2FfuiDm9`*z`Lt=b3jt(JRZe!4X**|gwA z_Cw7K<^>{3TC52s;oJwKk{fPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0rW{kK~z{r?Ug%7 z98na8e>I4&QB?4efDpvS!774PL~N`TvlTf6bss}^sLh-T7 zN{Ce$n-BsLWnB=_DVWto?kv(w7wY#KGY2AyskH)MA<9h!7W2iq`yDEg&Oyv^ou$6exkT0 zxA4X2Y@;HguTD4Ln^=N>^?@ZEf|xcZ#)bN}9)13fGN(euiaF1nqOSX~^uIp)aI*uj zId7|`vaJF6oj)jVtj53JCxO=RQP>P&#Sq?#7nl;sWK#5$k4Q`H#|x_D_INireJ*^W zh|{5q5=YfQT8 zN2KGyBkb<(Ba``szxgxizaD#at+liI65ob=6LzPwDssWc<@D|By@t*C$1^`SCs&Tv zaU7ADofU;bK`bN^)+vgI*Q2eeRw-cTFpF;o8Kr>ttJ}us8Wpm+ZdzMY t4accenG15cJhI0p!7w&MgoNB@fd6fa>lR8td>a4&002ovPDHLkV1jy|7;^vs literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/deeja_doctor.png b/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/deeja_doctor.png new file mode 100644 index 0000000000000000000000000000000000000000..97778a2245638c9465bd29e4bf07845ed3382747 GIT binary patch literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij)0(?STs~kfQWOZyyX=K&Xni81N+c){hkt0i@O8)=cs{a&I;?j z0;=IG@Q5sCVBk9h!i=ICUJXFO9iA?ZAr}5m`!DhxQs8m*-YUB7rP}Q$|NmcMGTr9( zc=Jb{mN*L$wx`_n8a7$wC)zGBx0q?VF&H{cc<47XN{Yp0O6~1K@r~?1?cx;MOjhXX z_-SysJFFE|7x>uOX;QkzVWQIMf;Lg1U>T*tOLsOLvJm9=dAwxj!+R5=+Doq8C}7%H zlAv|1fJuN?-~J)X0dLpINh}8}^{%U)n`P~G!gBrXZEKBQdp*@W@vd(5n@2BZJ&^m^ eCokZ&leyeHc&hd)-^D;bFnGH9xvXy5dd z`zu4vw8aALd3+|t2}miH1o;L3Cjc1cAH1LlRLoi65n0T@z;_6Q8AUa`8i0cPJzX3_ zEc~DLz2-Zlz~ja!t8wCr;hr~Y@BdG!D>mKMdF=kN%K}kV8Y@1v+KbHFx#I};UJ);Q zvnEciwrdfO#7-MJNGD%-uKYwet@Xzb79O4%?gcFYJyF`umWnN>cJ*!+4dsrxQ6=rP zAxI%6Kl-_6f#MTLh+L3x){91gOOc zh6wsN?DsY-y_Dc||NCK!KISs3nU$O`{I<{JmdKI;Vst0N)9{K>z>% literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/fakesky_passenger.png b/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/fakesky_passenger.png new file mode 100644 index 0000000000000000000000000000000000000000..a09bcede10d7b4a3ecc2b02260e058ea6158ae5f GIT binary patch literal 415 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij)0(?STb#!cj%-GmEb8{b8*En0-kgTjMPfyS3)2DCVyje?2>*mdyy?vAI z?d|L8>i+-#zi!PMUS8e;2d&BB)*Ev@_g99TX^RD#(0sVB8%Rl%1o;I6m0<%6XNC1% z0o8C8ctjR6Fz_7)VaDV6D^h@hdpunnLoEE?_Pypitia(G7`Wy2wRO{f{>!&oqtd$M zbe;Z9LpQssRStg-#lO&CTxIQ-{?96#|3M7LK}!aG+h-yNsyR9&q7-f2rZ>E(P>it; z+}mHnnDpfpt2MI=#~%AL2UJce22Z+j(Mc=BC_i~drHjG#R{|4@&b0)7YTU}c>taGw zm_)FqYVRbgZ*5a5Jq5NfROEXIO=0*k-TnLbW1^!y-Q8WxbhdX(o9WA^*{in%=%xjln(4`=c^eftXiW~c-k9sT zzcS=ZTP)C?Yy9&!0V&0jAiv=M1OUVQgBKKmia85BB8wRq_zrEsK~m7fTwwf^|Q!oxGey`UwaCraDdQnBUKuHMa}q1-Vys-&GZ z#7V^5`1zu#d*40z7c2!2Z!Ed?^v;KUf1Ky~Kd)I?8PBEKKEe2Di@=m@!4QF%0IN8` z5J4Y@{oaP9mlB-re?M%|$6RJLvy$_L-}afDd~+E;o-F^<5O7NNwn MboFyt=akR{02xKQ2><{9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/kate_commander.png b/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/kate_commander.png new file mode 100644 index 0000000000000000000000000000000000000000..05bfcb9df5205a60042e28bdcc5dd0a0b2ce76ca GIT binary patch literal 456 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikL1AIbUMa@M{w&=;ai<(8qiwp8M zP1tj>`7)4_FA4Gs1}eh?7|u$T2>_LH7I;J!GcfQS0%1l`4X*~E;7Lyx#}EtuyL~r> zniY6l8@2Qpx2!AG{QrL@?+m}@%YO53AKr1N;DYua@wz~PPc=#>y*xBq7nK}fS@=X% zLDc@}J!2CluM`u`0?TSA%R{X(;;MRcgZl~`!(A8r(pV7q_|g=<84SmwRve6CHsSoB z-@y7>Y7bEU;1-7PhHC*phGl`6zPsh5DJHS^zs%LtbQ4NE&?d%qzSreLgT05=Jk~Wc z!)!Poo7{hvxuoPkOKRk`+}mL_msCCo6_oF1FDuDtTOxb!1Ao(Ze&&dr?u@sEn}D8T N@O1TaS?83{1OQCMx77du literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/meta.json b/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/meta.json new file mode 100644 index 000000000000..5a5300f6b924 --- /dev/null +++ b/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "sprited by Sky (https://github.com/Kukutis96513)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "aursai_commander" + }, + { + "name": "brains_rd" + }, + { + "name": "deeja_doctor" + }, + { + "name": "deeja_salvage" + }, + { + "name": "fakesky_passenger" + }, + { + "name": "gazes_salvage" + }, + { + "name": "kate_commander" + }, + { + "name": "moon_cmo" + }, + { + "name": "nashira_detective" + }, + { + "name": "nebula_rd" + }, + { + "name": "piet_doctor" + }, + { + "name": "sky_doctor" + }, + { + "name": "stars_bartender" + }, + { + "name": "wipes_janitor" + }, + { + "name": "zack_cargo" + } + ] +} diff --git a/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/moon_cmo.png b/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/moon_cmo.png new file mode 100644 index 0000000000000000000000000000000000000000..cd730e37c3459700df3684917892cafdb242fa8c GIT binary patch literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijA1AIbUZ%N;}D0y+W*lr_UqQH`Tzfaq%LEDgVyA5>y5dd`zu4vw8a8V)!jE`0g#d| z3GxdDs=)ym)J?cefyy`wJR*x382Ao@Fyrz36)8Z$W1cRKAr}5m`%m&6GT?EM7Mjx= zq*0>y|NlZCDf80{on!=+BWG5{-Pyq{|0Ul+y(NJ={9Wif7EjH`foF5;8)Lk_tznzM zwKJ=eEg)Sr@XypQS6Kw_cZ9#Yos-qLM7d$h&7#Gf)`6@Fn~q8LZVC~URPerLRsZqa zA<-oE2}v&R*RAVcCcv}6RN+Hhb$^Y93tO8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/nashira_detective.png b/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/nashira_detective.png new file mode 100644 index 0000000000000000000000000000000000000000..451fecde0c751acb6e3356ee98c89dd60d9e754c GIT binary patch literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilW1AIbUU8Eetlmp|{qdMz$+lgC;Ses~RY5n-|BV0MSGb^S%!f*QY>HlXj z%&5u@3JS8dwe|G$v=A|lH{;3DN#f<@H8V4lm6a`U(3%`>y)oBwe`Uy-wpgIq_h#`= z2U4;nL4Lvi@c@R%w&z(ug`5Q*k;M!Qe1}1p@p%4<6rkWHPZ!4!3;(x$cliz}@VGH9 zEw=c!xHxC>_j*5WlZ~+|akDF`9B;k95OP%iPivEam-7D&ewk}~3|}tvY~t2>nz5ow zz|cNX(r&VJ$-M=yrKi{>cgApBbSlm~5ETBPDfeKk?3P0hoSq-B=3lqi?r>|}i9;8H z=L?#DG1w*OQfG1LF9m@YtFP9+~qAwC~L6g9%O?iFdc<9-Xe%xxL}# mKc6=*F7ODt*F9oyk%-snNPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0lrB@K~z{r?Ug}G z0znkVpM_x7DtV~92X1gP)rLtZMRwo z#fn1IO2Km4H_f^c81sY<(f%&~dH>m&|J$8`1q%xci@yjH`kh|>kJyA#;6Z-BpBIRx zX<|g*kG#O^^)iRUAu5wrs|A%xg}mQ@P$|BK-zYuT@pwEu)Ci2lVqCFCALqrR(vXh8>2yLg8igXXAeYN=4;5?lah?jP zfl{et!%LSB?Ss0Ya!;L8;Y_d5$9ZlNATPjko|z8waUzj`NF>6?h2kY_tgn*y8x$(d z#d%>X5S)Z^`3|bpM|f?%@o_)l2x$>sGPm0eQ-KNLm>iwt`)WWM4A*}^>>!omHy>3| z6qZgVS*O!shw1e1{tegWL*0Pj_$c_sT%rQFeW=6reN|KdyQf#u`$|2C;YO%yWEd1> rNX(ct8cnD_zjT|SG+|-!p8@y)u(RGY4?;uQ00000NkvXXu0mjf#&7fU literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/piet_doctor.png b/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/piet_doctor.png new file mode 100644 index 0000000000000000000000000000000000000000..c4c598841b7a6625003d720fa827d21be0a88ff5 GIT binary patch literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil=1AIbUf%Mb83(ifdyT4&ZZ{Or2M~?je|6fkKBs)9X)b^y2$%@d>(7L+1 zb!*l{>M|BMXiW~c-k9sTzcS=ZTP#rT+$-g0fRt!SkY6xRBL-m5zFGSUsDQJ;BeIx* zf$tCqGm2_>H2?*dc)B=-SolBfzsT3Dz~kz8yUDNJ>fit9@C_$-xNQFZR)A@{j8wr- z?t0Cb7jpwP>}9-Y`Mx%Ni|6^*2fVk5-C4l9M?R0$)J-V)5$m=bG7)xPmbopa(Y)oBq606}#@Vgn3kh4o$m z)o>PgL>4nJ@ErzW#^d=bQh+CJ<& z*v>7#+1$x-iMFEGs|-eEw@1e%qC8p(J3Ks#oVg#jmp00i_>zopr09Lf36aWAK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/stars_bartender.png b/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/stars_bartender.png new file mode 100644 index 0000000000000000000000000000000000000000..a9b3b09826d55ac50ee7edc616088edfd9a57b62 GIT binary patch literal 419 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilW1AIbU6}cVE#gb%i+>pCmY9JJ$&F{Zt$r68me|b( z<^KKqX{m{d3QDrFvWA9+T3T8kf-rPNxMHL;ht!~fUc81e&;r4@7Au{VdtlI<@ zd3Y)w{ddXT&RAb|ory()7vqO%4?8qj4jkkykCMq3Ib_jy+2*|P+c_uSFojNcPg86! iZu#-Vy3WDlCFe2UlrQYX=4L>5GkCiCxvX2({uXt>65yBmb)L= zym|BW%ls2*QwT=75LA98%+^VT{&<(ie~ zE0rA!F4;)Ea^W~NBj)+B5A$jc&T6r(cf8rX_tZ`SC&mhA4Gr0Xg&GGJHU~+>tauf> zLi?1pQwD?JLQ7GntA}Kx45vH2m{Tk}ms9bJ>@nBI2Tt}q{~o$~u?YV<*#A$`{3)}V z&t((+(?-X=<{pXexcqf$#A4^Y9Y3C^*Ew<|GROH8MjmUDI}7vygQu&X%Q~loCIBze BydMAn literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/zack_cargo.png b/Resources/Textures/_Umbra/Objects/Fun/figurines.rsi/zack_cargo.png new file mode 100644 index 0000000000000000000000000000000000000000..808951c2e483321e7f269495083af2e5b296b15b GIT binary patch literal 413 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijA1AIbU)1nzpZe`fE4ajF$vV@_kiXkg2Yxe}F1;yH%H*cOkefog|2QvIr zwY0Q6Jw0#UylHQ5UsqT6|NsAWYt}^SG8Q;!O%Au-nCrQ}GUQBKEYJ`+$rBtvO1dP- zFBqr{2VhV);Wh;-<1FxqEM{QfI}E~%$MaXD00q~1x;Tbd_&@Et%hzPUNBSm*D61p3$l99#Cz}PYW_nHn)pt-PH$SaN14UL?ib5)r>lPr`1a25 zW?awlsmc7{jSknw2ThI9%|ZuRm@n_SGre+A&4HFVpQF4YKQ8rqtoop&+Qh76MSF*` e{YP%6wf@T&$LYPVb|?b6oWax8&t;ucLK6Vnj<37` literal 0 HcmV?d00001 diff --git a/Resources/migration.yml b/Resources/migration.yml index 9514e5192efa..647dfbf82ff7 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -192,22 +192,7 @@ Observationskit: null # 2024-02-26 CrateBaseWeldable: CrateGenericSteel -# 2024-03-7 -AirlockExternalEasyPry: AirlockExternal -AirlockExternalGlassEasyPry: AirlockExternalGlass -AirlockGlassShuttleEasyPry: AirlockGlassShuttle -AirlockShuttleEasyPry: AirlockShuttle -AirlockExternalEasyPryLocked: AirlockExternalLocked -AirlockExternalGlassEasyPryLocked: AirlockExternalGlassLocked -AirlockGlassShuttleEasyPryLocked: AirlockExternalGlassShuttleLocked -AirlockShuttleEasyPryLocked: AirlockExternalShuttleLocked - -#2024-03-10 -ClothingBackpackFilledDetective: ClothingBackpackSecurityFilledDetective -ClothingBackpackDuffelFilledDetective: ClothingBackpackDuffelSecurityFilledDetective -ClothingBackpackSatchelFilledDetective: ClothingBackpackSatchelSecurityFilledDetective - -# 2024-03-11 -ImprovisedExplosive: FireBomb -ImprovisedExplosiveEmpty: FireBombEmpty -ImprovisedExplosiveFuel: FireBombFuel +# 2024-03-12 (UMBRA) +MysteryFigureBox: MysteryFigureBoxUmbra +VendingMachineGames: VendingMachineGamesUmbra +SpacemenFigureSpawner: SpacemenFigureSpawnerUmbra