From b5161934200ef95e80b5b6aaa2c581c4ee603b51 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 6 Oct 2023 06:17:23 +0200 Subject: [PATCH] Migration + Various items to fix missing prototypes in maps (#108) * woo migrating stuff for mappers * a * Medical Cyborg and ArachneWeb * PowerCellBluespace to PowerCellHigh * Spider legs and salvage lore * unused * Actually I might do the medicalborg * revert --- .../catalog/fills/crates/medical-crates.ftl | 2 - .../VendingMachines/Inventories/scidrobe.yml | 1 + .../Catalog/Fills/Paper/salvage_lore.yml | 79 +++++++++++++++++++ Resources/migration.yml | 36 +++++++++ 4 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Fills/Paper/salvage_lore.yml diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/medical-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/medical-crates.ftl index e7cd8346f5d..19fad66b196 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/medical-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/medical-crates.ftl @@ -1,5 +1,3 @@ -ent-CrateMedicalDefib = Defibrillator crate - ent-CrateMedicalSupplies = Medical supplies crate .desc = Basic medical supplies. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml index 6dab237f357..10d9c8cb195 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml @@ -14,3 +14,4 @@ ClothingMaskGas: 3 ClothingOuterWinterSci: 2 ClothingNeckScarfStripedPurple: 3 + ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Paper/salvage_lore.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Paper/salvage_lore.yml new file mode 100644 index 00000000000..f37c3bbdb3e --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Paper/salvage_lore.yml @@ -0,0 +1,79 @@ +- type: entity + name: Salvage Lore Paper Gaming Spawner + id: SalvageLorePaperGamingSpawner + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: Objects/Misc/bureaucracy.rsi + state: paper_words + - type: RandomSpawner + prototypes: + - PaperWrittenSalvageLoreGaming1 + - PaperWrittenSalvageLoreGaming2 + - PaperWrittenSalvageLoreGaming3 + - PaperWrittenSalvageLoreGaming4 + offset: 0.1 + +- type: entity + id: PaperWrittenSalvageLoreGaming1 + noSpawn: true # keep this from spamming spawn sheet + suffix: "Salvage: Lore: Gaming 1" + parent: Paper + components: + - type: Paper + content: | + Can't stay for the game. + Engineering want me to keep a close eye on the singularity SMESes. + Leaving this so you know what's up. + Sorry. + - Alexander +- type: entity + id: PaperWrittenSalvageLoreGaming2 + noSpawn: true # keep this from spamming spawn sheet + suffix: "Salvage: Lore: Gaming 2" + parent: Paper + components: + - type: Paper + content: | + Johny Clowe + Class: Druid + Alignment: Neutral Good + Str: 1,294,139 + Dex: 4,102,103 + Con: 9,522,913 + Int: 528,491 + Wis: 1 + Cha: 1 + Where's the age? + Why are those ability scores so ridiculous? + What even are you trying to do here, Leah? - Your Friendly DM +- type: entity + id: PaperWrittenSalvageLoreGaming3 + noSpawn: true # keep this from spamming spawn sheet + suffix: "Salvage: Lore: Gaming 3" + parent: Paper + components: + - type: Paper + content: | + THE GIANT SPACE FLY FROM SPACE + Session 1: They should have just learned what's going on with the world and the Giant Space Fly. + Session 2: They should know to ask the Wizard's Court about seismic distortions. + Session 3: On their way to underground lair. + Session 4: Just ran into the Architect Of Flies. + Oh dear goodness they just started randomly killing everybody +- type: entity + id: PaperWrittenSalvageLoreGaming4 + noSpawn: true # keep this from spamming spawn sheet + suffix: "Salvage: Lore: Gaming 4" + parent: Paper + components: + - type: Paper + content: | + Won't be able to come to the meet, chemist blew up the hospital again. + Fifth time this shift. + It's amazing. + But not in a good way. + Cheers, - Arielle +# ---- diff --git a/Resources/migration.yml b/Resources/migration.yml index 7b0414ad4d2..21f93bb1d11 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -108,3 +108,39 @@ ScienceTechFab: Protolathe ScienceTechFabCircuitboard: ProtolatheMachineCircuitboard ServiceTechFab: Autolathe ServiceTechFabCircuitboard: AutolatheMachineCircuitboard + +# 2023-10-05 (Rebase related migrations) +FoodMothTomatoSauce: null +LockerEpistemicsFilled: LockerScienceFilled +LockerMystagogueFilled: LockerResearchDirectorFilled +HyperlinkBookAlerts: BookRandom +HyperlinkBookAtmos: BookAtmosDistro +HyperlinkBookBartending: BookBartendersManual +HyperlinkBookBotany: BookLeafLoversSecret +HyperlinkBookChemistry: BookChemicalCompendium +HyperlinkBookCooking: BookChefGaming +HyperlinkBookGlimmer: BookScientistsGuidebook +HyperlinkBookHacking: BookEngineersHandbook +HyperlinkBookMedical: BookMedicalReferenceBook +HyperlinkBookPower: BookEngineersHandbook +HyperlinkBookProcedure: BookRandom +HyperlinkBookShuttle: BookRandom +HyperlinkBookSpaceLaw: BookSecurity +HyperlinkBookSupernanny: BookHowToSurvive +SpawnPointCataloguer: SpawnPointLibrarian +SpawnPointCyborg: SpawnPointBorg +SpawnPointMedicalCyborg: SpawnPointBorg +SpawnPointEpistemologist: SpawnPointScientist +SpawnPointMystagogue: SpawnPointResearchDirector +SpawnPointSalvageTechnician: SpawnPointSalvageSpecialist +SpawnPointValet: SpawnPointServiceWorker +VendingMachineEpiDrobe: VendingMachineSciDrobe +PlushieMoffRandom: PlushieMothRandom +PlushieMoffbar: PlushieMothBartender +PlushieMoffsician: PlushieMothMusician +PlushieMoff: PlushieMoth +ArachneWeb: SpiderWeb +PowerCellBluespace: PowerCellHigh +CrateMedicalDefib: CrateMedical +LeftLegSpider: null +RightLegSpider: null