diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 8ad8c75980a..756d7608141 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -15,7 +15,7 @@ Gunshots/explosions/opening doors/less rare audio (done) var/image/halimage var/image/halbody var/obj/halitem - var/hal_screwyhud = 0 //1 - critical, 2 - dead, 3 - oxygen indicator, 4 - toxin indicator + var/hal_screwyhud = 0 //1 - critical, 2 - dead, 3 - oxygen indicator, 4 - toxin indicator, 5 - perfect health var/handling_hal = 0 var/hal_crit = 0 diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 4d4876bb4db..0e90a523120 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -707,6 +707,7 @@ switch(H.hal_screwyhud) if(1) H.healths.icon_state = "health6" if(2) H.healths.icon_state = "health7" + if(5) H.healths.icon_state = "health0" else switch(H.health - H.staminaloss) if(100 to INFINITY) H.healths.icon_state = "health0" @@ -737,6 +738,8 @@ icon_num = 4 if(damage > (comparison*4)) icon_num = 5 + if(H.hal_screwyhud == 5) + icon_num = 0 if(icon_num) H.healthdoll.overlays += image('icons/mob/screen_gen.dmi',"[L.name][icon_num]") diff --git a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm index 38290e992d5..46f948999db 100644 --- a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm @@ -223,6 +223,30 @@ M.adjustFireLoss(-0.5*REM) ..() return + +/datum/reagent/medicine/mine_salve + name = "Miner's Salve" + id = "mine_salve" + description = "Slowly heals burn and brute damage, and causes subject to believe they are fully healed." + reagent_state = LIQUID + color = "#6D6374" + metabolization_rate = 0.4 * REAGENTS_METABOLISM + +/datum/reagent/medicine/mine_salve/on_mob_life(mob/living/M) + if(istype(M, /mob/living/carbon)) + var/mob/living/carbon/N = M + N.hal_screwyhud = 5 + M.adjustBruteLoss(-0.25*REM) + M.adjustFireLoss(-0.25*REM) + ..() + return + + +/datum/reagent/medicine/mine_salve/on_mob_delete(mob/living/M) + if(istype(M, /mob/living/carbon)) + var/mob/living/carbon/N = M + N.hal_screwyhud = 0 + ..() /datum/reagent/medicine/synthflesh name = "Synthflesh" diff --git a/code/modules/reagents/Chemistry-Recipes/Medicine.dm b/code/modules/reagents/Chemistry-Recipes/Medicine.dm index 357eac96a5e..3442575e841 100644 --- a/code/modules/reagents/Chemistry-Recipes/Medicine.dm +++ b/code/modules/reagents/Chemistry-Recipes/Medicine.dm @@ -57,6 +57,22 @@ result = "salglu_solution" required_reagents = list("sodiumchloride" = 1, "water" = 1, "sugar" = 1) result_amount = 3 + +/datum/chemical_reaction/mine_salve + name = "Miner's Salve" + id = "mine_salve" + result = "mine_salve" + required_reagents = list("oil" = 1, "water" = 1, "iron" = 1) + mix_message = "The fine black particles dissolve into the oily substance." + result_amount = 3 + +/datum/chemical_reaction/mine_salve2 + name = "Miner's Salve" + id = "mine_salve" + result = "mine_salve" + required_reagents = list("plasma" = 1, "water" = 1, "iron" = 1) + mix_message = "The iron adheres to the plasma and forms a thick goo." + result_amount = 5 /datum/chemical_reaction/synthflesh name = "Synthflesh" diff --git a/html/changelogs/lordpidey.yml b/html/changelogs/lordpidey.yml new file mode 100644 index 00000000000..1c74b0453f6 --- /dev/null +++ b/html/changelogs/lordpidey.yml @@ -0,0 +1,7 @@ +author: LordPidey + +delete-after: True + +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a new medication, Miner's Salve. It is a faster version of Saline-Glucose that also makes the patient think they are instantly better. Produced with Oil+Water+Iron, or Plasma+Water+Iron."