From 21e3feb94bff4a154df200fe27dcdc21135750aa Mon Sep 17 00:00:00 2001 From: Geeves Date: Sat, 1 May 2021 11:21:57 +0200 Subject: [PATCH] Phoron Shizz (#11772) --- code/ZAS/Phoron.dm | 25 ++++++++++---------- code/game/objects/objs.dm | 2 ++ code/modules/mob/living/carbon/human/life.dm | 9 ++++--- html/changelogs/geeves-phoron_shizz.yml | 6 +++++ 4 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 html/changelogs/geeves-phoron_shizz.yml diff --git a/code/ZAS/Phoron.dm b/code/ZAS/Phoron.dm index 8ba2fd3d6e6..4be3f602839 100644 --- a/code/ZAS/Phoron.dm +++ b/code/ZAS/Phoron.dm @@ -5,40 +5,40 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') var/PHORON_DMG_NAME = "Phoron Damage Amount" var/PHORON_DMG_DESC = "Self Descriptive" - var/CLOTH_CONTAMINATION = 1 + var/CLOTH_CONTAMINATION = TRUE var/CLOTH_CONTAMINATION_NAME = "Cloth Contamination" var/CLOTH_CONTAMINATION_DESC = "If this is on, phoron does damage by getting into cloth." - var/PHORONGUARD_ONLY = 0 + var/PHORONGUARD_ONLY = FALSE var/PHORONGUARD_ONLY_NAME = "\"PhoronGuard Only\"" var/PHORONGUARD_ONLY_DESC = "If this is on, only biosuits and spacesuits protect against contamination and ill effects." - var/GENETIC_CORRUPTION = 0 + var/GENETIC_CORRUPTION = FALSE var/GENETIC_CORRUPTION_NAME = "Genetic Corruption Chance" var/GENETIC_CORRUPTION_DESC = "Chance of genetic corruption as well as toxic damage, X in 10,000." - var/SKIN_BURNS = 0 + var/SKIN_BURNS = TRUE var/SKIN_BURNS_DESC = "Phoron has an effect similar to mustard gas on the un-suited." var/SKIN_BURNS_NAME = "Skin Burns" - var/EYE_BURNS = 1 + var/EYE_BURNS = TRUE var/EYE_BURNS_NAME = "Eye Burns" var/EYE_BURNS_DESC = "Phoron burns the eyes of anyone not wearing eye protection." - var/CONTAMINATION_LOSS = 0.02 + var/CONTAMINATION_LOSS = 2 var/CONTAMINATION_LOSS_NAME = "Contamination Loss" - var/CONTAMINATION_LOSS_DESC = "How much toxin damage is dealt from contaminated clothing" //Per tick? ASK ARYN + var/CONTAMINATION_LOSS_DESC = "How much fire damage is dealt from contaminated clothing, per life process." - var/PHORON_HALLUCINATION = 0 + var/PHORON_HALLUCINATION = FALSE var/PHORON_HALLUCINATION_NAME = "Phoron Hallucination" var/PHORON_HALLUCINATION_DESC = "Does being in phoron cause you to hallucinate?" - var/N2O_HALLUCINATION = 1 + var/N2O_HALLUCINATION = TRUE var/N2O_HALLUCINATION_NAME = "N2O Hallucination" var/N2O_HALLUCINATION_DESC = "Does being in sleeping gas cause you to hallucinate?" -obj/var/contaminated = 0 +/obj/var/contaminated = 0 /obj/item/proc/can_contaminate() @@ -87,8 +87,9 @@ obj/var/contaminated = 0 //Burn skin if exposed. if(vsc.plc.SKIN_BURNS) if(!pl_head_protected() || !pl_suit_protected()) - burn_skin(0.75) - if(prob(20)) to_chat(src, "Your skin burns!") + burn_skin(2) + if(prob(20)) + to_chat(src, SPAN_DANGER("Your skin burns!")) updatehealth() //Burn eyes if exposed. diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 52c922a963f..292bc5cee15 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -242,6 +242,8 @@ . = ..() if((obj_flags & OBJ_FLAG_ROTATABLE) || (obj_flags & OBJ_FLAG_ROTATABLE_ANCHORED)) to_chat(user, SPAN_SUBTLE("Can be rotated with alt-click.")) + if(contaminated) + to_chat(user, SPAN_ALIEN("\The [src] has been contaminated with phoron!")) // whether mobs can unequip and drop items into us or not /obj/proc/can_hold_dropped_items() diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 32fc04e570e..9cd396b9bd4 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -643,11 +643,14 @@ stamina_recovery *= 1 + 0.3 * chem_effects[CE_SPEEDBOOST] move_delay_mod += -1.5 * chem_effects[CE_SPEEDBOOST] - var/total_phoronloss = 0 for(var/obj/item/I in src) if(I.contaminated && !(isvaurca(src) && src.species.has_organ[BP_FILTRATION_BIT])) - total_phoronloss += vsc.plc.CONTAMINATION_LOSS - if(!(status_flags & GODMODE)) adjustToxLoss(total_phoronloss) + if(I == r_hand) + apply_damage(vsc.plc.CONTAMINATION_LOSS, BURN, BP_R_HAND) + else if(I == l_hand) + apply_damage(vsc.plc.CONTAMINATION_LOSS, BURN, BP_L_HAND) + else + adjustFireLoss(vsc.plc.CONTAMINATION_LOSS) if (intoxication) handle_intoxication() diff --git a/html/changelogs/geeves-phoron_shizz.yml b/html/changelogs/geeves-phoron_shizz.yml new file mode 100644 index 00000000000..fd7700877ec --- /dev/null +++ b/html/changelogs/geeves-phoron_shizz.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Phoron has been buffed to do more damage when contacting the skin in gas form." \ No newline at end of file