From 840ab165f388c2c98fbae087f24463ffa6a57698 Mon Sep 17 00:00:00 2001 From: Xhuis Date: Tue, 29 Sep 2015 22:31:12 -0400 Subject: [PATCH 1/4] Buffs the Doctor's Delight to its old effects --- code/modules/food&drinks/recipes/drinks_recipes.dm | 2 +- .../Consumable-Reagents/Drink-Reagents/Drinks.dm | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/code/modules/food&drinks/recipes/drinks_recipes.dm b/code/modules/food&drinks/recipes/drinks_recipes.dm index c981d5ebb00..d5bac77ace3 100644 --- a/code/modules/food&drinks/recipes/drinks_recipes.dm +++ b/code/modules/food&drinks/recipes/drinks_recipes.dm @@ -178,7 +178,7 @@ name = "The Doctor's Delight" id = "doctordelight" result = "doctorsdelight" - required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1, "omnizine" = 1) + required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1, "cryoxadone" = 1) result_amount = 5 /datum/chemical_reaction/irish_cream diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm index 89c9a9a54c4..7718993fb5c 100644 --- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm @@ -392,9 +392,16 @@ /datum/reagent/consumable/doctor_delight name = "The Doctor's Delight" id = "doctorsdelight" - description = "A gulp a day keeps the MediBot away. That's probably for the best." + description = "A gulp a day keeps the Medibot away! A mixture of juices that heals most damage types fairly quickly." color = "#FF8CFF" // rgb: 255, 140, 255 +/datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/M) + M.adjustBruteLoss(-2) + M.adjustFireLoss(-2) + M.adjustToxLoss(-2) + M.adjustOxyLoss(-2) + ..() + /datum/reagent/consumable/chocolatepudding name = "Chocolate Pudding" id = "chocolatepudding" From 4e33e464a406cd9923313ed18f1aae76cc93ca97 Mon Sep 17 00:00:00 2001 From: Xhuis Date: Tue, 29 Sep 2015 23:12:45 -0400 Subject: [PATCH 2/4] Implements hunger drain + changelog --- code/modules/food&drinks/drinks/drinks/drinkingglass.dm | 2 +- .../Consumable-Reagents/Drink-Reagents/Drinks.dm | 5 ++++- html/changelogs/Xhuis-DoctorsDelight.yml | 7 +++++++ 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/Xhuis-DoctorsDelight.yml diff --git a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm index d428b046440..5f0fc881673 100644 --- a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm @@ -185,7 +185,7 @@ if("doctorsdelight") icon_state = "doctorsdelightglass" name = "Doctor's Delight" - desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place." + desc = "The space doctor's favorite. Guaranteed to restore bodily injury; side effects include cravings and hunger." if("manlydorf") icon_state = "manlydorfglass" name = "The Manly Dorf" diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm index 7718993fb5c..06a5c64710c 100644 --- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm @@ -392,7 +392,7 @@ /datum/reagent/consumable/doctor_delight name = "The Doctor's Delight" id = "doctorsdelight" - description = "A gulp a day keeps the Medibot away! A mixture of juices that heals most damage types fairly quickly." + description = "A gulp a day keeps the Medibot away! A mixture of juices that heals most damage types fairly quickly at the cost of hunger." color = "#FF8CFF" // rgb: 255, 140, 255 /datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/M) @@ -400,6 +400,9 @@ M.adjustFireLoss(-2) M.adjustToxLoss(-2) M.adjustOxyLoss(-2) + if(M.nutrition && (M.nutrition - 2 > 0)) + if(!(M.mind && M.mind.assigned_role == "Medical Doctor")) //Drains the nutrition of the holder. Not medical doctors though, since it's the Doctor's Delight! + M.nutrition -= 2 ..() /datum/reagent/consumable/chocolatepudding diff --git a/html/changelogs/Xhuis-DoctorsDelight.yml b/html/changelogs/Xhuis-DoctorsDelight.yml new file mode 100644 index 00000000000..c11831ac07c --- /dev/null +++ b/html/changelogs/Xhuis-DoctorsDelight.yml @@ -0,0 +1,7 @@ +author: Xhuis +delete-after: True + +changes: + - tweak: "Doctor's Delight now requires cryoxadone in its recipe instead of omnizine." + - tweak: "Doctor's Delight now restores two brute, burn, toxin, and oxygen damage per tick." + - tweak: "Doctor's Delight now drains nutrition while it's in your system (that is, unless you're a doctor)." \ No newline at end of file From 2d98626ce36ca2dbbf397b368f6a5f01f8f1da03 Mon Sep 17 00:00:00 2001 From: Xhuis Date: Wed, 30 Sep 2015 13:23:06 -0400 Subject: [PATCH 3/4] Nerfs the buff --- .../Consumable-Reagents/Drink-Reagents/Drinks.dm | 12 ++++++------ html/changelogs/Xhuis-DoctorsDelight.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm index 06a5c64710c..ea1343f832f 100644 --- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm @@ -396,13 +396,13 @@ color = "#FF8CFF" // rgb: 255, 140, 255 /datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/M) - M.adjustBruteLoss(-2) - M.adjustFireLoss(-2) - M.adjustToxLoss(-2) - M.adjustOxyLoss(-2) - if(M.nutrition && (M.nutrition - 2 > 0)) + M.adjustBruteLoss(-0.5) + M.adjustFireLoss(-0.5) + M.adjustToxLoss(-0.5) + M.adjustOxyLoss(-0.5) + if(M.nutrition && (M.nutrition - 1 > 0)) if(!(M.mind && M.mind.assigned_role == "Medical Doctor")) //Drains the nutrition of the holder. Not medical doctors though, since it's the Doctor's Delight! - M.nutrition -= 2 + M.nutrition -= 1 ..() /datum/reagent/consumable/chocolatepudding diff --git a/html/changelogs/Xhuis-DoctorsDelight.yml b/html/changelogs/Xhuis-DoctorsDelight.yml index c11831ac07c..0e77af1b2fb 100644 --- a/html/changelogs/Xhuis-DoctorsDelight.yml +++ b/html/changelogs/Xhuis-DoctorsDelight.yml @@ -3,5 +3,5 @@ delete-after: True changes: - tweak: "Doctor's Delight now requires cryoxadone in its recipe instead of omnizine." - - tweak: "Doctor's Delight now restores two brute, burn, toxin, and oxygen damage per tick." + - tweak: "Doctor's Delight now restores half a point of brute, burn, toxin, and oxygen damage per tick." - tweak: "Doctor's Delight now drains nutrition while it's in your system (that is, unless you're a doctor)." \ No newline at end of file From 292aeb2367a850299ee75799c99b37b8c57b3b4c Mon Sep 17 00:00:00 2001 From: Xhuis Date: Wed, 30 Sep 2015 13:23:29 -0400 Subject: [PATCH 4/4] Oopsie --- .../Consumable-Reagents/Drink-Reagents/Drinks.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm index ea1343f832f..e945e1f44b9 100644 --- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm @@ -400,9 +400,9 @@ M.adjustFireLoss(-0.5) M.adjustToxLoss(-0.5) M.adjustOxyLoss(-0.5) - if(M.nutrition && (M.nutrition - 1 > 0)) + if(M.nutrition && (M.nutrition - 2 > 0)) if(!(M.mind && M.mind.assigned_role == "Medical Doctor")) //Drains the nutrition of the holder. Not medical doctors though, since it's the Doctor's Delight! - M.nutrition -= 1 + M.nutrition -= 2 ..() /datum/reagent/consumable/chocolatepudding