From 943f1c8dd84f04879515766ce3491a89af20818a Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 5 Oct 2023 18:26:20 +0200 Subject: [PATCH 1/8] woo migrating stuff for mappers --- .../Catalog/Fills/Lockers/heads.yml | 2 ++ .../VendingMachines/Inventories/scidrobe.yml | 1 + Resources/migration.yml | 30 +++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 2f246c6cd13..1f287c9fda7 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -239,6 +239,7 @@ - id: HandTeleporter - id: DoorRemoteResearch - id: ClothingHeadHatBeretRND + - id: ClothingHeadHatBeretMysta # Nyanotrasen - Mystagogue beret - id: ClothingHandsGlovesColorPurple - id: ClothingBeltUtilityFilled - id: RubberStampRd @@ -261,6 +262,7 @@ - id: HandTeleporter - id: DoorRemoteResearch - id: ClothingHeadHatBeretRND + - id: ClothingHeadHatBeretMysta # Nyanotrasen - Mystagogue beret - id: ClothingHandsGlovesColorPurple - id: ClothingBeltUtilityFilled - id: RubberStampRd 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/migration.yml b/Resources/migration.yml index 7b0414ad4d2..a522a5c5412 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -108,3 +108,33 @@ 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 +SpawnPointEpistemologist: SpawnPointScientist +SpawnPointMystagogue: SpawnPointResearchDirector +SpawnPointSalvageTechnician: SpawnPointSalvageSpecialist +SpawnPointValet: SpawnPointServiceWorker +VendingMachineEpiDrobe: VendingMachineSciDrobe +PlushieMoffRandom: PlushieMothRandom +PlushieMoffbar: PlushieMothBartender +PlushieMoffsician: PlushieMothMusician +PlushieMoff: PlushieMoth From bed7934f50e88a871b4e4bf1efa0c095f0e5d0c9 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 5 Oct 2023 18:27:44 +0200 Subject: [PATCH 2/8] a --- Resources/Prototypes/Catalog/Fills/Lockers/heads.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 1f287c9fda7..2f246c6cd13 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -239,7 +239,6 @@ - id: HandTeleporter - id: DoorRemoteResearch - id: ClothingHeadHatBeretRND - - id: ClothingHeadHatBeretMysta # Nyanotrasen - Mystagogue beret - id: ClothingHandsGlovesColorPurple - id: ClothingBeltUtilityFilled - id: RubberStampRd @@ -262,7 +261,6 @@ - id: HandTeleporter - id: DoorRemoteResearch - id: ClothingHeadHatBeretRND - - id: ClothingHeadHatBeretMysta # Nyanotrasen - Mystagogue beret - id: ClothingHandsGlovesColorPurple - id: ClothingBeltUtilityFilled - id: RubberStampRd From 9906133371eae3227a9c9e70657ab73da930b9fd Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 5 Oct 2023 20:49:25 +0200 Subject: [PATCH 3/8] Medical Cyborg and ArachneWeb --- Resources/migration.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/migration.yml b/Resources/migration.yml index a522a5c5412..5f6dfc3e6fb 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -129,6 +129,7 @@ HyperlinkBookSpaceLaw: BookSecurity HyperlinkBookSupernanny: BookHowToSurvive SpawnPointCataloguer: SpawnPointLibrarian SpawnPointCyborg: SpawnPointBorg +SpawnPointMedicalCyborg: SpawnPointBorg SpawnPointEpistemologist: SpawnPointScientist SpawnPointMystagogue: SpawnPointResearchDirector SpawnPointSalvageTechnician: SpawnPointSalvageSpecialist @@ -138,3 +139,4 @@ PlushieMoffRandom: PlushieMothRandom PlushieMoffbar: PlushieMothBartender PlushieMoffsician: PlushieMothMusician PlushieMoff: PlushieMoth +ArachneWeb: SpiderWeb From e24b968668639206b08827a34c51d7bf14f5ba2d Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 5 Oct 2023 21:06:58 +0200 Subject: [PATCH 4/8] PowerCellBluespace to PowerCellHigh --- Resources/migration.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/migration.yml b/Resources/migration.yml index 5f6dfc3e6fb..fa6636d3214 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -140,3 +140,4 @@ PlushieMoffbar: PlushieMothBartender PlushieMoffsician: PlushieMothMusician PlushieMoff: PlushieMoth ArachneWeb: SpiderWeb +PowerCellBluespace: PowerCellHigh From 95e84e6927c7247e117c25bd14462b615ee9c84a Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 5 Oct 2023 21:15:13 +0200 Subject: [PATCH 5/8] Spider legs and salvage lore --- .../Catalog/Fills/Paper/salvage_lore.yml | 79 +++++++++++++++++++ Resources/migration.yml | 3 + 2 files changed, 82 insertions(+) create mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Fills/Paper/salvage_lore.yml 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 fa6636d3214..21f93bb1d11 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -141,3 +141,6 @@ PlushieMoffsician: PlushieMothMusician PlushieMoff: PlushieMoth ArachneWeb: SpiderWeb PowerCellBluespace: PowerCellHigh +CrateMedicalDefib: CrateMedical +LeftLegSpider: null +RightLegSpider: null From 5d7a291fea40f494225a9bd9f81d680587152d3b Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 5 Oct 2023 21:19:35 +0200 Subject: [PATCH 6/8] unused --- .../en-US/prototypes/catalog/fills/crates/medical-crates.ftl | 2 -- 1 file changed, 2 deletions(-) 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. From 6bf0c979e95d25436d295b4dd7e4c38bc8443bca Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 5 Oct 2023 21:22:48 +0200 Subject: [PATCH 7/8] Actually I might do the medicalborg --- Resources/migration.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/migration.yml b/Resources/migration.yml index 21f93bb1d11..492ec2e3d33 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -129,7 +129,6 @@ HyperlinkBookSpaceLaw: BookSecurity HyperlinkBookSupernanny: BookHowToSurvive SpawnPointCataloguer: SpawnPointLibrarian SpawnPointCyborg: SpawnPointBorg -SpawnPointMedicalCyborg: SpawnPointBorg SpawnPointEpistemologist: SpawnPointScientist SpawnPointMystagogue: SpawnPointResearchDirector SpawnPointSalvageTechnician: SpawnPointSalvageSpecialist From 21431278bb959c7f018c9586241fca34f070954e Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 5 Oct 2023 21:42:44 +0200 Subject: [PATCH 8/8] revert --- Resources/migration.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/migration.yml b/Resources/migration.yml index 492ec2e3d33..21f93bb1d11 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -129,6 +129,7 @@ HyperlinkBookSpaceLaw: BookSecurity HyperlinkBookSupernanny: BookHowToSurvive SpawnPointCataloguer: SpawnPointLibrarian SpawnPointCyborg: SpawnPointBorg +SpawnPointMedicalCyborg: SpawnPointBorg SpawnPointEpistemologist: SpawnPointScientist SpawnPointMystagogue: SpawnPointResearchDirector SpawnPointSalvageTechnician: SpawnPointSalvageSpecialist