From a77ad9a4219ba2bc945b8235696e99d47a9e8a02 Mon Sep 17 00:00:00 2001 From: Saeko-44 Date: Mon, 9 Dec 2024 16:11:36 +0100 Subject: [PATCH 1/5] 3 new endgame chems --- .filenesting.json | 3 ++ .../_Impstation/reagents/meta/chemicals.ftl | 2 + .../en-US/_Impstation/reagents/meta/fun.ftl | 5 ++- .../_Impstation/reagents/meta/medicine.ftl | 3 ++ .../Structures/Specific/Anomaly/cores.yml | 9 ++++ .../_Impstation/Reagents/chemicals.yml | 9 ++++ .../Prototypes/_Impstation/Reagents/fun.yml | 14 +++++++ .../_Impstation/Reagents/medicine.yml | 26 ++++++++++++ .../Recipes/Reactions/chemicals.yml | 41 ++++++++++++++++++- 9 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 .filenesting.json create mode 100644 Resources/Locale/en-US/_Impstation/reagents/meta/chemicals.ftl create mode 100644 Resources/Prototypes/_Impstation/Reagents/chemicals.yml diff --git a/.filenesting.json b/.filenesting.json new file mode 100644 index 00000000000000..0b719662778815 --- /dev/null +++ b/.filenesting.json @@ -0,0 +1,3 @@ +{ + "help":"https://go.microsoft.com/fwlink/?linkid=866610" +} \ No newline at end of file diff --git a/Resources/Locale/en-US/_Impstation/reagents/meta/chemicals.ftl b/Resources/Locale/en-US/_Impstation/reagents/meta/chemicals.ftl new file mode 100644 index 00000000000000..88911184c7fd95 --- /dev/null +++ b/Resources/Locale/en-US/_Impstation/reagents/meta/chemicals.ftl @@ -0,0 +1,2 @@ +reagent-name-philosophers-juice = philosopher's juice +reagent-desc-philosophers-juice = A pseudo-magical catalyst for advanced chemistry. diff --git a/Resources/Locale/en-US/_Impstation/reagents/meta/fun.ftl b/Resources/Locale/en-US/_Impstation/reagents/meta/fun.ftl index 6c5b509148b194..22978602d29a8c 100644 --- a/Resources/Locale/en-US/_Impstation/reagents/meta/fun.ftl +++ b/Resources/Locale/en-US/_Impstation/reagents/meta/fun.ftl @@ -8,4 +8,7 @@ reagent-name-propulsion-gel = propulsion gel reagent-desc-propulsion-gel = A refinement of the accelerative properties of Gastropoid mucin. Acts kind of like one of those moving walkways you get in airports. reagent-name-ungh-juice = juice that makes you UNGH -reagent-desc-ungh-juice = The glucose and citric acid seem to have neutralized the toxic effects of the vent crud. Though, the mixture has caused new side-effects to occur. \ No newline at end of file +reagent-desc-ungh-juice = The glucose and citric acid seem to have neutralized the toxic effects of the vent crud. Though, the mixture has caused new side-effects to occur. + +reagent-name-holium = holium +reagent-desc-holium = An impossibly compressed liquid. It feels as though it could tear through any surface. diff --git a/Resources/Locale/en-US/_Impstation/reagents/meta/medicine.ftl b/Resources/Locale/en-US/_Impstation/reagents/meta/medicine.ftl index 2ae8d1fb19274e..0ba33b6343934d 100644 --- a/Resources/Locale/en-US/_Impstation/reagents/meta/medicine.ftl +++ b/Resources/Locale/en-US/_Impstation/reagents/meta/medicine.ftl @@ -6,3 +6,6 @@ reagent-desc-subjuzine = A devious alteration of cognizine that bends the creatu reagent-name-caramexinin = caramexinin reagent-desc-caramexinin = An artificial sweetener that treats and prevents Theobromine poisoning in animals. + +reagent-name-abnormium = abnormium +reagent-desc-abnormium = A strange liquid of alien origin. diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml index 568a133749e71d..ea8840a5971099 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml @@ -33,6 +33,15 @@ timeToDecay: 600 startPrice: 10000 endPrice: 200 + #Imp special : grind the cores for abnormalium + - type: Extractable + grindableSolutionName: abnoJuice + - type: SolutionContainerManager + solutions: + abnoJuice: + reagents: + - ReagentId: Abnormium + Quantity: 25 - type: entity parent: BaseAnomalyCore diff --git a/Resources/Prototypes/_Impstation/Reagents/chemicals.yml b/Resources/Prototypes/_Impstation/Reagents/chemicals.yml new file mode 100644 index 00000000000000..392c10a8c9fc38 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Reagents/chemicals.yml @@ -0,0 +1,9 @@ +- type: reagent + id: PhilosophersJuice + name: reagent-name-philosophers-juice + desc: reagent-desc-philosophers-juice + physicalDesc: reagent-physical-desc-space-grease + flavor: bitter + color: "#7e009e" + boilingPoint: -127.3 # Same as plasma + meltingPoint: -186.4 diff --git a/Resources/Prototypes/_Impstation/Reagents/fun.yml b/Resources/Prototypes/_Impstation/Reagents/fun.yml index efa4201f3ce51b..3ecc6711dc161e 100644 --- a/Resources/Prototypes/_Impstation/Reagents/fun.yml +++ b/Resources/Prototypes/_Impstation/Reagents/fun.yml @@ -109,3 +109,17 @@ desc: reagent-desc-testosterone physicalDesc: reagent-physical-desc-chalky color: "#267ef0" + +- type: reagent + id: Holium + # group: Special # The recipe is complicated enough that I think we shouldnt hide the recipe honestly + name: reagent-name-holium + desc: reagent-desc-holium + physicalDesc: reagent-physical-desc-threat + flavor: bottomless + color: "#000000" + tileReactions: + - !type:CreateEntityTileReaction + entity: FloorChasmEntity + maxOnTileWhitelist: + tags: [ FloorChasmEntity ] diff --git a/Resources/Prototypes/_Impstation/Reagents/medicine.yml b/Resources/Prototypes/_Impstation/Reagents/medicine.yml index 33e8d51bf835c8..bc71775f6b779b 100644 --- a/Resources/Prototypes/_Impstation/Reagents/medicine.yml +++ b/Resources/Prototypes/_Impstation/Reagents/medicine.yml @@ -49,3 +49,29 @@ types: Poison: -0.2 +- type: reagent + id: Abnormium + name: reagent-name-abnormium + group: Medicine + desc: reagent-desc-abnormium + flavor: sour + color: "#64ffe6" + physicalDesc: reagent-physical-desc-enigmatic + slippery: false + metabolisms: + # Bad omnizine that also gives you cancer + Medicine: + effects: + - !type:ModifyBloodLevel + amount: 2 + - !type:HealthChange + damage: + groups: + Brute: -2 + Burn: -2 + Airloss: -2 + Toxin: -2 + Genetic: 5 + - !type:ModifyBleedAmount + amount: -1 + diff --git a/Resources/Prototypes/_Impstation/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/_Impstation/Recipes/Reactions/chemicals.yml index 68bf804172ad32..31fca67788f6e8 100644 --- a/Resources/Prototypes/_Impstation/Recipes/Reactions/chemicals.yml +++ b/Resources/Prototypes/_Impstation/Recipes/Reactions/chemicals.yml @@ -10,7 +10,7 @@ amount: 2 products: Estradiol: 5 - + - type: reaction id: Testosterone impact: Medium @@ -23,3 +23,42 @@ amount: 2 products: Testosterone: 5 + +- type: reaction + id: PhilosophersJuice + impact: Medium + minTemp: 500 + reactants: + TableSalt: + amount: 25 + Silver: + amount: 25 + Gold: + amount: 25 + Plasma: + amount: 25 + Blood: + amount: 100 + products: + PhilosophersJuice: 1 + +- type: reaction + id: Holium + impact: High + minTemp: 1000 + reactants: + Carbon: + amount: 200 + UncookedAnimalProteins: + amount: 50 + Honk: + amount: 50 + Abnormium: + amount: 50 + Frezon: + amount: 50 + PhilosophersJuice: + amount: 1 + catalyst: true + products: + Holium: 1 From 069fffafaa64291ffed5756ba7d39a8f0f22722f Mon Sep 17 00:00:00 2001 From: Saeko-44 Date: Mon, 9 Dec 2024 16:27:01 +0100 Subject: [PATCH 2/5] fixed a typo and deleted a useless file oops --- .filenesting.json | 3 --- .../Prototypes/Entities/Structures/Specific/Anomaly/cores.yml | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 .filenesting.json diff --git a/.filenesting.json b/.filenesting.json deleted file mode 100644 index 0b719662778815..00000000000000 --- a/.filenesting.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "help":"https://go.microsoft.com/fwlink/?linkid=866610" -} \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml index ea8840a5971099..1344066a669709 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml @@ -33,7 +33,7 @@ timeToDecay: 600 startPrice: 10000 endPrice: 200 - #Imp special : grind the cores for abnormalium + #Imp special : grind the cores for abnormium - type: Extractable grindableSolutionName: abnoJuice - type: SolutionContainerManager From 3a13beb5a7801d565000293124e0e8693f81a26c Mon Sep 17 00:00:00 2001 From: Saeko-44 Date: Mon, 9 Dec 2024 16:45:44 +0100 Subject: [PATCH 3/5] yaml linter said I needed to add a new floor tag --- Resources/Prototypes/_Impstation/Reagents/fun.yml | 2 +- Resources/Prototypes/tags.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Impstation/Reagents/fun.yml b/Resources/Prototypes/_Impstation/Reagents/fun.yml index 3ecc6711dc161e..b0a700ce4b2648 100644 --- a/Resources/Prototypes/_Impstation/Reagents/fun.yml +++ b/Resources/Prototypes/_Impstation/Reagents/fun.yml @@ -116,7 +116,7 @@ name: reagent-name-holium desc: reagent-desc-holium physicalDesc: reagent-physical-desc-threat - flavor: bottomless + flavor: singulo color: "#000000" tileReactions: - !type:CreateEntityTileReaction diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 87db0b49da1da6..91f2984d1e9fc7 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -563,6 +563,9 @@ - type: Tag id: Flesh +- type: Tag + id: FloorChasmEntity + - type: Tag id: Flower From 39e546300d9d35ceaa0d8bedcfb6ee4dd508d7bf Mon Sep 17 00:00:00 2001 From: Saeko-44 Date: Mon, 9 Dec 2024 17:36:03 +0100 Subject: [PATCH 4/5] changed abnormalium to anomalium --- .../Locale/en-US/_Impstation/reagents/meta/medicine.ftl | 4 ++-- .../Entities/Structures/Specific/Anomaly/cores.yml | 4 ++-- Resources/Prototypes/_Impstation/Reagents/medicine.yml | 6 +++--- .../Prototypes/_Impstation/Recipes/Reactions/chemicals.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Locale/en-US/_Impstation/reagents/meta/medicine.ftl b/Resources/Locale/en-US/_Impstation/reagents/meta/medicine.ftl index 0ba33b6343934d..f90d8de69a4d12 100644 --- a/Resources/Locale/en-US/_Impstation/reagents/meta/medicine.ftl +++ b/Resources/Locale/en-US/_Impstation/reagents/meta/medicine.ftl @@ -7,5 +7,5 @@ reagent-desc-subjuzine = A devious alteration of cognizine that bends the creatu reagent-name-caramexinin = caramexinin reagent-desc-caramexinin = An artificial sweetener that treats and prevents Theobromine poisoning in animals. -reagent-name-abnormium = abnormium -reagent-desc-abnormium = A strange liquid of alien origin. +reagent-name-anomalium = anomalium +reagent-desc-anomalium = A strange liquid of alien origin. diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml index 1344066a669709..c8342dda51cea3 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml @@ -33,14 +33,14 @@ timeToDecay: 600 startPrice: 10000 endPrice: 200 - #Imp special : grind the cores for abnormium + #Imp special : grind the cores for anomalium - type: Extractable grindableSolutionName: abnoJuice - type: SolutionContainerManager solutions: abnoJuice: reagents: - - ReagentId: Abnormium + - ReagentId: Anomalium Quantity: 25 - type: entity diff --git a/Resources/Prototypes/_Impstation/Reagents/medicine.yml b/Resources/Prototypes/_Impstation/Reagents/medicine.yml index bc71775f6b779b..4cc5794a172462 100644 --- a/Resources/Prototypes/_Impstation/Reagents/medicine.yml +++ b/Resources/Prototypes/_Impstation/Reagents/medicine.yml @@ -50,10 +50,10 @@ Poison: -0.2 - type: reagent - id: Abnormium - name: reagent-name-abnormium + id: Anomalium + name: reagent-name-anomalium group: Medicine - desc: reagent-desc-abnormium + desc: reagent-desc-anomalium flavor: sour color: "#64ffe6" physicalDesc: reagent-physical-desc-enigmatic diff --git a/Resources/Prototypes/_Impstation/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/_Impstation/Recipes/Reactions/chemicals.yml index 31fca67788f6e8..8e0e0b7b51ad4d 100644 --- a/Resources/Prototypes/_Impstation/Recipes/Reactions/chemicals.yml +++ b/Resources/Prototypes/_Impstation/Recipes/Reactions/chemicals.yml @@ -53,7 +53,7 @@ amount: 50 Honk: amount: 50 - Abnormium: + Anomalium: amount: 50 Frezon: amount: 50 From 74c1a54dde656bb9c51e749d4e59a485c26594a4 Mon Sep 17 00:00:00 2001 From: Saeko-44 Date: Mon, 9 Dec 2024 17:41:23 +0100 Subject: [PATCH 5/5] Moved the tag to imp folder --- Resources/Prototypes/_Impstation/tags.yml | 3 +++ Resources/Prototypes/tags.yml | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_Impstation/tags.yml b/Resources/Prototypes/_Impstation/tags.yml index 934400adc8a2d1..e97eceed33cca2 100644 --- a/Resources/Prototypes/_Impstation/tags.yml +++ b/Resources/Prototypes/_Impstation/tags.yml @@ -22,6 +22,9 @@ - type: Tag id: DionaMinded + +- type: Tag + id: FloorChasmEntity - type: Tag id: MagazineLPistol diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 91f2984d1e9fc7..87db0b49da1da6 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -563,9 +563,6 @@ - type: Tag id: Flesh -- type: Tag - id: FloorChasmEntity - - type: Tag id: Flower