diff --git a/Resources/Prototypes/_Nuclear14/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/_Nuclear14/Reagents/Consumable/Drink/drinks.yml
index 150654869e6..9ab97130b89 100644
--- a/Resources/Prototypes/_Nuclear14/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/_Nuclear14/Reagents/Consumable/Drink/drinks.yml
@@ -3,18 +3,21 @@
id: N14MilkBrahmin
parent: Milk
name: reagent-name-milk-brahmin
+ group: Biological
desc: reagent-desc-milk-brahmin
- type: reagent
id: N14MilkBighorner
parent: Milk
name: reagent-name-milk-bighorner
+ group: Biological
desc: reagent-desc-milk-bighorner
- type: reagent
id: N14MilkRadstag
parent: Milk
name: reagent-name-milk-radstag
+ group: Biological
desc: reagent-desc-milk-radstag
# Tea
@@ -23,6 +26,7 @@
id: TeaAgave
parent: GreenTea
name: reagent-name-tea-agave
+ group: Biological
desc: reagent-desc-tea-agave
metabolisms:
Drink:
@@ -43,12 +47,14 @@
id: TeaBarrelCactus
parent: GreenTea
name: reagent-name-tea-barrelcactus
+ group: Biological
desc: reagent-desc-tea-barrelcactus
- type: reagent
id: TeaBroc
parent: GreenTea
name: reagent-name-tea-broc
+ group: Biological
desc: reagent-desc-tea-broc
metabolisms:
Medicine:
@@ -63,6 +69,7 @@
id: TeaDatura
parent: GreenTea
name: reagent-name-tea-datura
+ group: Biological
desc: reagent-desc-tea-datura
metabolisms:
Poison:
@@ -82,12 +89,14 @@
id: TeaMutfruit
parent: GreenTea
name: reagent-name-tea-mutfruit
+ group: Biological
desc: reagent-desc-tea-mutfruit
- type: reagent
id: TeaNettle
parent: GreenTea
name: reagent-name-tea-nettle
+ group: Biological
desc: reagent-desc-tea-nettle
- type: reagent
@@ -118,6 +127,7 @@
id: TeaXander
parent: GreenTea
name: reagent-name-tea-xander
+ group: Biological
desc: reagent-desc-tea-xander
## Other Teas
@@ -125,6 +135,7 @@
parent: TeaAgave
id: TeaFireantNectar
name: reagent-name-tea-fireantnectar
+ group: Biological
desc: reagent-desc-tea-fireantnectar
metabolisms:
Drink:
diff --git a/Resources/Prototypes/_Nuclear14/Reagents/Consumable/Drink/liquids.yml b/Resources/Prototypes/_Nuclear14/Reagents/Consumable/Drink/liquids.yml
index 74334f27b1f..bcb610d613d 100644
--- a/Resources/Prototypes/_Nuclear14/Reagents/Consumable/Drink/liquids.yml
+++ b/Resources/Prototypes/_Nuclear14/Reagents/Consumable/Drink/liquids.yml
@@ -5,6 +5,7 @@
name: reagent-name-water-filtered
parent: Water
desc: reagent-desc-water-filtered
+ group: Water
physicalDesc: reagent-physical-desc-translucent
metabolisms:
Drink: # can maybe remove this code duplication if its not overwritten, same below.
@@ -23,6 +24,7 @@
name: reagent-name-water-dirty
parent: Water
desc: reagent-desc-water-dirty
+ group: Water
physicalDesc: reagent-physical-desc-translucent
metabolisms:
Drink: # can maybe remove this code duplication if its not overwritten, same below.
@@ -42,6 +44,7 @@
name: reagent-name-water-irradiated
parent: Water
desc: reagent-desc-water-irradiated
+ group: Water
physicalDesc: reagent-physical-desc-glowing
metabolisms:
Drink:
@@ -60,6 +63,7 @@
id: WaterSalt
name: reagent-name-water-salt
parent: BaseDrink
+ group: Botanical
desc: reagent-desc-water-salt
slippery: true
physicalDesc: reagent-physical-desc-translucent
@@ -88,4 +92,4 @@
- !type:PlantAdjustPests
amount: -1
- !type:PlantAdjustHealth
- amount: -2
\ No newline at end of file
+ amount: -2
diff --git a/Resources/Prototypes/_Nuclear14/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/_Nuclear14/Reagents/Consumable/Drink/soda.yml
index 6277a3750f9..654dbed6f17 100644
--- a/Resources/Prototypes/_Nuclear14/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/_Nuclear14/Reagents/Consumable/Drink/soda.yml
@@ -2,6 +2,7 @@
parent: BaseSoda
id: NukaCola
name: reagent-name-nuka-cola
+ group: Soda
desc: reagent-desc-nuka-cola
physicalDesc: reagent-physical-desc-fizzy
color: "#362d1d"
@@ -18,6 +19,7 @@
parent: BaseSoda
id: IrradiatedNukaCola
name: reagent-name-irradiated-nuka-cola
+ group: Soda
desc: reagent-desc-irradiated-nuka-cola
physicalDesc: reagent-physical-desc-fizzy
color: "#4a4a32"
@@ -179,4 +181,4 @@
name: reagent-name-vim-quartz
desc: reagent-desc-vim-quartz
physicalDesc: reagent-physical-desc-fizzy
- color: "#E5F2AC"
\ No newline at end of file
+ color: "#E5F2AC"
diff --git a/Resources/Prototypes/_Nuclear14/Reagents/Consumable/extracts.yml b/Resources/Prototypes/_Nuclear14/Reagents/Consumable/extracts.yml
index 113562e436e..ddea832dca1 100644
--- a/Resources/Prototypes/_Nuclear14/Reagents/Consumable/extracts.yml
+++ b/Resources/Prototypes/_Nuclear14/Reagents/Consumable/extracts.yml
@@ -84,9 +84,10 @@
color: "#5f959c"
- type: reagent
+ parent: BaseDrink
id: ExtractCarrot
name: reagent-name-extract-carrot
- parent: BaseDrink
+ group: Extracts
desc: reagent-desc-extract-carrot
physicalDesc: reagent-physical-desc-crisp
flavor: carrot
@@ -159,7 +160,7 @@
- type: reagent
id: ExtractMaize
name: reagent-name-extract-maize
- group: Extract
+ group: Extracts
desc: reagent-desc-extract-maize
physicalDesc: reagent-physical-desc-coarse
flavor: fiber
@@ -216,7 +217,7 @@
- type: reagent
id: ExtractRazorgrainFlour
name: reagent-name-extract-razorgrain
- group: Extract
+ group: Extracts
desc: reagent-desc-extract-razorgrain
physicalDesc: reagent-physical-desc-powdery
flavor: chalky
diff --git a/Resources/Prototypes/_Nuclear14/Reagents/Consumable/food.yml b/Resources/Prototypes/_Nuclear14/Reagents/Consumable/food.yml
index 9771917c101..fa34e950e97 100644
--- a/Resources/Prototypes/_Nuclear14/Reagents/Consumable/food.yml
+++ b/Resources/Prototypes/_Nuclear14/Reagents/Consumable/food.yml
@@ -1,6 +1,7 @@
- type: reagent
id: N14UncookedAnimalProteinsRad
name: reagent-name-uncooked-animal-proteins-rad
+ group: Foods
desc: reagent-desc-uncooked-animal-proteins-rad
physicalDesc: reagent-physical-desc-clumpy
color: "#FFFFE5"
@@ -25,6 +26,7 @@
- type: reagent
id: N14RadParticleFood
name: reagent-name-rad-particle-food
+ group: Foods
desc: reagent-desc-rad-particle-food
physicalDesc: reagent-physical-desc-metallic
color: "#FFFFE5"
@@ -34,6 +36,7 @@
- type: reagent
id: ScorpionTail
name: reagent-name-scorpiontail
+ group: Foods
desc: reagent-desc-scorpiontail
physicalDesc: reagent-physical-desc-clumpy
color: "#FFFFE5"
@@ -51,6 +54,7 @@
- type: reagent
id: N14FireAntNectar
name: reagent-name-fireantnectar
+ group: Foods
desc: reagent-desc-fireantnectar
physicalDesc: reagent-physical-desc-clumpy
color: "#cc4814"
@@ -70,6 +74,7 @@
- type: reagent
id: N14BloatflyAcid
name: reagent-name-bloatflyacid
+ group: Foods
desc: reagent-desc-bloatflyacid
physicalDesc: reagent-physical-desc-clumpy
color: "#9ceb4d"
@@ -87,6 +92,7 @@
- type: reagent
id: N14CazadorAcid
name: reagent-name-cazadoracid
+ group: Foods
desc: reagent-desc-cazadoracid
physicalDesc: reagent-physical-desc-clumpy
color: "#9ceb4d"
diff --git a/Resources/Prototypes/_Nuclear14/Reagents/botanical.yml b/Resources/Prototypes/_Nuclear14/Reagents/botanical.yml
new file mode 100644
index 00000000000..4f33f0117ae
--- /dev/null
+++ b/Resources/Prototypes/_Nuclear14/Reagents/botanical.yml
@@ -0,0 +1,47 @@
+- type: reagent
+ id: Fertilizer
+ name: reagent-name-fertilizer
+ group: Botanical
+ desc: reagent-desc-fertilizer
+ flavor: bitter
+ color: "#664330"
+ physicalDesc: reagent-physical-desc-thick
+ plantMetabolism:
+ - !type:PlantAdjustNutrition
+ amount: 3
+ - !type:PlantAdjustPests
+ prob: 0.1
+ amount: -1
+ - !type:PlantAdjustHealth
+ amount: 0.1
+ - !type:PlantAffectGrowth
+ prob: 0.2
+ amount: 1
+ - !type:PlantDiethylamine {}
+ metabolisms:
+ Poison:
+ effects:
+ - !type:HealthChange
+ damage:
+ types:
+ Poison: 0.25
+ - !type:ChemVomit
+ probability: 0.45
+
+- type: reagent
+ id: Dung
+ name: reagent-name-dung
+ group: Botanical
+ desc: reagent-desc-dung
+ flavor: bitter
+ color: "#664330"
+ physicalDesc: reagent-physical-desc-thick
+ metabolisms:
+ Poison:
+ effects:
+ - !type:HealthChange
+ damage:
+ types:
+ Poison: 0.25
+ - !type:ChemVomit
+ probability: 0.80
diff --git a/Resources/Prototypes/_Nuclear14/Reagents/chems.yml b/Resources/Prototypes/_Nuclear14/Reagents/chems.yml
index c3c405d8e8f..9d1bf8473b4 100644
--- a/Resources/Prototypes/_Nuclear14/Reagents/chems.yml
+++ b/Resources/Prototypes/_Nuclear14/Reagents/chems.yml
@@ -296,45 +296,11 @@
- !type:EnduranceModifierReagent
enduranceModifier: 4 # increases endurance until % resistance is introduced
-- type: reagent
- id: Hydra
- name : reagent-name-hydra
- group: Chems
- desc: reagent-desc-hydra
- physicalDesc: reagent-physical-desc-volatile
- color: "#990099"
- metabolisms:
- Medicine:
- metabolismRate: 0.2
- effects:
- - !type:GenericStatusEffect
- key: SeeingRainbows
- component: SeeingRainbows
- type: Add
- time: 5
- refresh: false
- - !type:GenericStatusEffect
- key: Stutter
- component: ScrambledAccent
- - !type:GenericStatusEffect
- key: SlurredSpeech
- component: TelepathicRepeater
- - !type:Jitter
- - !type:EnduranceModifierReagent
- enduranceModifier: -1
- - !type:HealthChange
- damage:
- groups:
- Brute: -1
- Burn: -1
- - !type:ModifyBleedAmount
- amount: -0.5
-
#MARK: Tribal Chems
- type: reagent
id: MourningPoultice
name: reagent-name-mourning-poultice
- group: Medicine
+ group: Chems
desc: reagent-desc-mourning-poultice
physicalDesc: reagent-physical-desc-oily
color: "#1d3d22"
@@ -361,4 +327,4 @@
component: ScrambledAccent
- !type:GenericStatusEffect
key: SlurredSpeech
- component: TelepathicRepeater
\ No newline at end of file
+ component: TelepathicRepeater
diff --git a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml
index c79ed2b3d34..4f401dad621 100644
--- a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml
+++ b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml
@@ -182,54 +182,6 @@
color: "#1D3B3E"
price: 0.15
-- type: reagent
- id: Fertilizer
- name: reagent-name-fertilizer
- group: Botanical
- desc: reagent-desc-fertilizer
- flavor: bitter
- color: "#664330"
- physicalDesc: reagent-physical-desc-thick
- plantMetabolism:
- - !type:PlantAdjustNutrition
- amount: 3
- - !type:PlantAdjustPests
- prob: 0.1
- amount: -1
- - !type:PlantAdjustHealth
- amount: 0.1
- - !type:PlantAffectGrowth
- prob: 0.2
- amount: 1
- - !type:PlantDiethylamine {}
- metabolisms:
- Poison:
- effects:
- - !type:HealthChange
- damage:
- types:
- Poison: 0.25
- - !type:ChemVomit
- probability: 0.45
-
-- type: reagent
- id: Dung
- name: reagent-name-dung
- group: Botanical
- desc: reagent-desc-dung
- flavor: bitter
- color: "#664330"
- physicalDesc: reagent-physical-desc-thick
- metabolisms:
- Poison:
- effects:
- - !type:HealthChange
- damage:
- types:
- Poison: 0.25
- - !type:ChemVomit
- probability: 0.80
-
- type: material
id: N14Timber
stackEntity: N14FloraLogTimber
@@ -277,4 +229,4 @@
unit: materials-unit-roll
icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: thread }
color: "#d2691e"
- price: 0.10
\ No newline at end of file
+ price: 0.10
diff --git a/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml
index 516100e09b5..4b81f6dd0b7 100644
--- a/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml
+++ b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml
@@ -2,7 +2,7 @@
- type: reagent
id: HealingMixture #used in regular stimpacks
name: reagent-name-healing-mixture
- group: Chems
+ group: Medicine
desc: reagent-desc-healing-mixture
physicalDesc: reagent-physical-desc-soothing
color: "#00e5ff"
@@ -78,7 +78,7 @@
- type: reagent
id: HealingPowder
name: reagent-name-healing-powder
- group: Chems
+ group: Medicine
desc: reagent-desc-healing-powder
physicalDesc: reagent-physical-desc-soothing
color: "#00e5ff"
@@ -123,7 +123,7 @@
- type: reagent
id: AntidoteMixture
name: reagent-name-antidote-mixture
- group: Chems
+ group: Medicine
desc: reagent-desc-antidote-mixture
physicalDesc: reagent-physical-desc-soothing
color: "#D41244"
@@ -141,7 +141,7 @@
- type: reagent
id: Antidote
name: reagent-name-antidote
- group: Chems
+ group: Medicine
desc: reagent-desc-antidote
physicalDesc: reagent-physical-desc-soothing
color: "#D41244"
@@ -157,7 +157,7 @@
- type: reagent
id: RobustHealingMixture #used in super stimpacks
name: reagent-name-robust-healing-mixture
- group: Chems
+ group: Medicine
desc: reagent-desc-robust-healing-mixture
physicalDesc: reagent-physical-desc-opaque
color: "#00e5ff"
@@ -195,11 +195,53 @@
- !type:ReagentThreshold
min: 30
+- type: reagent
+ id: UltraRobustHealingMixture
+ name: reagent-name-ultra-robust-healing-mixture
+ group: Medicine
+ desc: reagent-desc-ultra-robust-healing-mixture
+ physicalDesc: reagent-physical-desc-overpowering
+ color: "#ff0000"
+ metabolisms:
+ Medicine:
+ effects:
+ - !type:HealthChange
+ damage:
+ groups:
+ Burn: -10
+ Brute: -10
+ Airloss: -10
+ Toxin: 0.5
+ - !type:ModifyBleedAmount
+ amount: -2
+ - !type:HealthChange
+ conditions:
+ - !type:ReagentThreshold
+ min: 30
+ damage:
+ groups:
+ Burn: -10 # Temporary invincibility more or less
+ Brute: -10
+ Airloss: -10
+ types:
+ Poison: 3
+ Cellular: 2 # Congratulations. Still revivable, but permanently fucked
+ - !type:MovespeedModifier
+ walkSpeedModifier: 0.40
+ sprintSpeedModifier: 0.40
+ conditions:
+ - !type:ReagentThreshold
+ min: 25
+ - !type:Drunk
+ conditions:
+ - !type:ReagentThreshold
+ min: 25
+
# Radiation
- type: reagent
id: RadAway
name: reagent-name-radaway
- group: Chems
+ group: Medicine
desc: reagent-desc-radaway
physicalDesc: reagent-physical-desc-oily
color: "#ff9000"
@@ -215,7 +257,7 @@
- type: reagent
id: RadAwayDiluted
name: reagent-name-diluted-radaway
- group: Chems
+ group: Medicine
desc: reagent-desc-diluted-radaway
physicalDesc: reagent-physical-desc-oily
color: "#ffbb60"
@@ -231,7 +273,7 @@
- type: reagent
id: RadX
name: reagent-name-rad-x # Should provide a radiation resistance instead of healing it
- group: Chems
+ group: Medicine
desc: reagent-desc-rad-x
physicalDesc: reagent-physical-desc-soapy
color: "#00e5ff"
@@ -248,7 +290,7 @@
- type: reagent
id: Fixer
name: reagent-name-fixer
- group: Chems
+ group: Medicine
desc: reagent-desc-fixer
physicalDesc: reagent-physical-desc-volatile
color: "#00e5ff"
@@ -282,7 +324,7 @@
- type: reagent
id: SmellingSalts
name: reagent-name-smelling-salts
- group: Chems
+ group: Medicine
desc: reagent-desc-smelling-salts
physicalDesc: reagent-physical-desc-strong-smelling
color: "#e1f5f4"
@@ -332,7 +374,7 @@
- type: reagent
id: HealingPoultice
name: reagent-name-healing-poultice
- group: Chems
+ group: Medicine
desc: reagent-desc-healing-poultice
physicalDesc: reagent-physical-desc-soothing
color: "#24b530"
@@ -358,7 +400,7 @@
- type: reagent
id: Bitterdrink
name: reagent-name-bitterdrink
- group: Chems
+ group: Medicine
desc: reagent-desc-bitterdrink
physicalDesc: reagent-physical-desc-sticky
color: "#ba67f5"
@@ -377,43 +419,35 @@
- !type:Drunk
- type: reagent
- id: UltraRobustHealingMixture
- name: reagent-name-ultra-robust-healing-mixture
+ id: Hydra
+ name : reagent-name-hydra
group: Chems
- desc: reagent-desc-ultra-robust-healing-mixture
- physicalDesc: reagent-physical-desc-overpowering
- color: "#ff0000"
+ desc: reagent-desc-hydra
+ physicalDesc: reagent-physical-desc-volatile
+ color: "#990099"
metabolisms:
Medicine:
+ metabolismRate: 0.2
effects:
+ - !type:GenericStatusEffect
+ key: SeeingRainbows
+ component: SeeingRainbows
+ type: Add
+ time: 5
+ refresh: false
+ - !type:GenericStatusEffect
+ key: Stutter
+ component: ScrambledAccent
+ - !type:GenericStatusEffect
+ key: SlurredSpeech
+ component: TelepathicRepeater
+ - !type:Jitter
+ - !type:EnduranceModifierReagent
+ enduranceModifier: -1
- !type:HealthChange
damage:
groups:
- Burn: -10
- Brute: -10
- Airloss: -10
- Toxin: 0.5
+ Brute: -1
+ Burn: -1
- !type:ModifyBleedAmount
- amount: -2
- - !type:HealthChange
- conditions:
- - !type:ReagentThreshold
- min: 30
- damage:
- groups:
- Burn: -10 # Temporary invincibility more or less
- Brute: -10
- Airloss: -10
- types:
- Poison: 3
- Cellular: 2 # Congratulations. Still revivable, but permanently fucked
- - !type:MovespeedModifier
- walkSpeedModifier: 0.40
- sprintSpeedModifier: 0.40
- conditions:
- - !type:ReagentThreshold
- min: 25
- - !type:Drunk
- conditions:
- - !type:ReagentThreshold
- min: 25
+ amount: -0.5
diff --git a/Resources/ServerInfo/_Nuclear14/Guidebooks/Crafting/Medicine.xml b/Resources/ServerInfo/_Nuclear14/Guidebooks/Crafting/Medicine.xml
index 414de93cd4b..675e42ffcfa 100644
--- a/Resources/ServerInfo/_Nuclear14/Guidebooks/Crafting/Medicine.xml
+++ b/Resources/ServerInfo/_Nuclear14/Guidebooks/Crafting/Medicine.xml
@@ -3,6 +3,37 @@
This is a list of -all- medications available.
+# Medicine
+
+
+# Chems
+# Biological
+
+
+# Botanical
+
+
+# Extracts
+
+
+# Foods
+
+
+# Toxin
+
+
+# Alchohol
+
+
+# Water
+
+
+# Nuka-Cola & Vim
+
+
+# Products
+
+