From adf05442091eddabb6bf6a6aba4f2a274d441fa2 Mon Sep 17 00:00:00 2001 From: TZK13 Date: Tue, 20 Jan 2015 00:01:12 -0600 Subject: [PATCH] Adds another new symptom and combines both vision symptoms. --- code/datums/diseases/advance/symptoms/skin.dm | 86 +++++++++++ .../symptoms/{visionloss.dm => vision.dm} | 138 +++++++++++------- .../diseases/advance/symptoms/visionaid.dm | 38 ----- .../diseases/advance/symptoms/vitiligo.dm | 42 ------ tgstation.dme | 5 +- 5 files changed, 177 insertions(+), 132 deletions(-) create mode 100644 code/datums/diseases/advance/symptoms/skin.dm rename code/datums/diseases/advance/symptoms/{visionloss.dm => vision.dm} (54%) delete mode 100644 code/datums/diseases/advance/symptoms/visionaid.dm delete mode 100644 code/datums/diseases/advance/symptoms/vitiligo.dm diff --git a/code/datums/diseases/advance/symptoms/skin.dm b/code/datums/diseases/advance/symptoms/skin.dm new file mode 100644 index 00000000000..86cf573f973 --- /dev/null +++ b/code/datums/diseases/advance/symptoms/skin.dm @@ -0,0 +1,86 @@ +/* +////////////////////////////////////// +Vitiligo + + Extremely Noticable. + Decreases resistance slightly. + Reduces stage speed slightly. + Reduces transmission. + Critical Level. + +BONUS + Makes the mob lose skin pigmentation. + +////////////////////////////////////// +*/ + +/datum/symptom/vitiligo + + name = "Vitiligo" + stealth = -3 + resistance = -1 + stage_speed = -1 + transmittable = -2 + level = 5 + severity = 1 + +/datum/symptom/vitiligo/Activate(var/datum/disease/advance/A) + ..() + if(prob(SYMPTOM_ACTIVATION_PROB)) + var/mob/living/M = A.affected_mob + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = M + if(H.skin_tone == "albino") + return + switch(A.stage) + if(5) + H.skin_tone = "albino" + H.update_body(0) + else + H.visible_message("[H] looks a bit pale...", "You look a bit pale...") + + return + + +/* +////////////////////////////////////// +Revitiligo + + Extremely Noticable. + Decreases resistance slightly. + Reduces stage speed slightly. + Reduces transmission. + Critical Level. + +BONUS + Makes the mob gain skin pigmentation. + +////////////////////////////////////// +*/ + +/datum/symptom/revitiligo + + name = "Revitiligo" + stealth = -3 + resistance = -1 + stage_speed = -1 + transmittable = -2 + level = 5 + severity = 1 + +/datum/symptom/vitiligo/Activate(var/datum/disease/advance/A) + ..() + if(prob(SYMPTOM_ACTIVATION_PROB)) + var/mob/living/M = A.affected_mob + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = M + if(H.skin_tone == "african2") + return + switch(A.stage) + if(5) + H.skin_tone = "african2" + H.update_body(0) + else + H.visible_message("[H] looks a bit dark...", "You look a bit dark...") + + return \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/visionloss.dm b/code/datums/diseases/advance/symptoms/vision.dm similarity index 54% rename from code/datums/diseases/advance/symptoms/visionloss.dm rename to code/datums/diseases/advance/symptoms/vision.dm index c80b5a35d6c..b63a4ee729f 100644 --- a/code/datums/diseases/advance/symptoms/visionloss.dm +++ b/code/datums/diseases/advance/symptoms/vision.dm @@ -1,49 +1,89 @@ -/* -////////////////////////////////////// - -Hyphema (Eye bleeding) - - Slightly noticable. - Lowers resistance tremendously. - Decreases stage speed tremendously. - Decreases transmittablity. - Critical Level. - -Bonus - Causes blindness. - -////////////////////////////////////// -*/ - -/datum/symptom/visionloss - - name = "Hyphema" - stealth = -1 - resistance = -4 - stage_speed = -4 - transmittable = -3 - level = 5 - severity = 4 - -/datum/symptom/visionloss/Activate(var/datum/disease/advance/A) - ..() - if(prob(SYMPTOM_ACTIVATION_PROB)) - var/mob/living/M = A.affected_mob - switch(A.stage) - if(1, 2) - M << "Your eyes itch." - if(3, 4) - M << "Your eyes ache." - M.eye_blurry = 10 - M.eye_stat += 1 - else - M << "Your eyes burn horrificly!" - M.eye_blurry = 20 - M.eye_stat += 5 - if (M.eye_stat >= 10) - M.disabilities |= NEARSIGHT - if (prob(M.eye_stat - 10 + 1) && !(M.eye_blind)) - M << "You go blind!" - M.disabilities |= BLIND - M.eye_blind = 1 - return \ No newline at end of file +/* +////////////////////////////////////// + +Hyphema (Eye bleeding) + + Slightly noticable. + Lowers resistance tremendously. + Decreases stage speed tremendously. + Decreases transmittablity. + Critical Level. + +Bonus + Causes blindness. + +////////////////////////////////////// +*/ + +/datum/symptom/visionloss + + name = "Hyphema" + stealth = -1 + resistance = -4 + stage_speed = -4 + transmittable = -3 + level = 5 + severity = 4 + +/datum/symptom/visionloss/Activate(var/datum/disease/advance/A) + ..() + if(prob(SYMPTOM_ACTIVATION_PROB)) + var/mob/living/M = A.affected_mob + switch(A.stage) + if(1, 2) + M << "Your eyes itch." + if(3, 4) + M << "Your eyes ache." + M.eye_blurry = 10 + M.eye_stat += 1 + else + M << "Your eyes burn horrificly!" + M.eye_blurry = 20 + M.eye_stat += 5 + if (M.eye_stat >= 10) + M.disabilities |= NEARSIGHT + if (prob(M.eye_stat - 10 + 1) && !(M.eye_blind)) + M << "You go blind!" + M.disabilities |= BLIND + M.eye_blind = 1 + return + + +/* +////////////////////////////////////// + +Ocular Restoration + + Noticable. + Lowers resistance significantly. + Decreases stage speed moderately.. + Decreases transmittablity tremendously. + High level. + +Bonus + Restores eyesight. + +////////////////////////////////////// +*/ + +/datum/symptom/visionaid + + name = "Ocular Restoration" + stealth = -1 + resistance = -3 + stage_speed = -2 + transmittable = -4 + level = 4 + +/datum/symptom/visionaid/Activate(var/datum/disease/advance/A) + ..() + if(prob(SYMPTOM_ACTIVATION_PROB * 5)) + var/mob/living/M = A.affected_mob + switch(A.stage) + if(4, 5) + if (M.reagents.get_reagent_amount("oculine") < 20) + M.reagents.add_reagent("oculine", 20) + else + if(prob(SYMPTOM_ACTIVATION_PROB * 5)) + M << "[pick("Your eyes feel great.", "You are now blinking manually.", "You don't feel the need to blink.")]" + return diff --git a/code/datums/diseases/advance/symptoms/visionaid.dm b/code/datums/diseases/advance/symptoms/visionaid.dm deleted file mode 100644 index cb77b24c74e..00000000000 --- a/code/datums/diseases/advance/symptoms/visionaid.dm +++ /dev/null @@ -1,38 +0,0 @@ -/* -////////////////////////////////////// - -Ocular Restoration - - Noticable. - Lowers resistance significantly. - Decreases stage speed moderately.. - Decreases transmittablity tremendously. - High level. - -Bonus - Restores eyesight. - -////////////////////////////////////// -*/ - -/datum/symptom/visionaid - - name = "Ocular Restoration" - stealth = -1 - resistance = -3 - stage_speed = -2 - transmittable = -4 - level = 4 - -/datum/symptom/visionaid/Activate(var/datum/disease/advance/A) - ..() - if(prob(SYMPTOM_ACTIVATION_PROB * 5)) - var/mob/living/M = A.affected_mob - switch(A.stage) - if(4, 5) - if (M.reagents.get_reagent_amount("oculine") < 20) - M.reagents.add_reagent("oculine", 20) - else - if(prob(SYMPTOM_ACTIVATION_PROB * 5)) - M << "[pick("Your eyes feel great.", "You are now blinking manually.", "You don't feel the need to blink.")]" - return diff --git a/code/datums/diseases/advance/symptoms/vitiligo.dm b/code/datums/diseases/advance/symptoms/vitiligo.dm deleted file mode 100644 index e24be2c36b5..00000000000 --- a/code/datums/diseases/advance/symptoms/vitiligo.dm +++ /dev/null @@ -1,42 +0,0 @@ -/* -////////////////////////////////////// -Vitiligo - - Extremely Noticable. - Decreases resistance slightly. - Reduces stage speed slightly. - Reduces transmission. - Critical Level. - -BONUS - Makes the mob lose skin pigmentation. - -////////////////////////////////////// -*/ - -/datum/symptom/vitiligo - - name = "Vitiligo" - stealth = -3 - resistance = -1 - stage_speed = -1 - transmittable = -2 - level = 5 - severity = 1 - -/datum/symptom/vitiligo/Activate(var/datum/disease/advance/A) - ..() - if(prob(SYMPTOM_ACTIVATION_PROB)) - var/mob/living/M = A.affected_mob - if(istype(M, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = M - if(H.skin_tone == "albino") - return - switch(A.stage) - if(5) - H.skin_tone = "albino" - H.update_body(0) - else - H.visible_message("[H] looks a bit pale...", "You look a bit pale...") - - return \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index 35257140988..9f5bc6f83a8 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -196,12 +196,11 @@ #include "code\datums\diseases\advance\symptoms\oxygen.dm" #include "code\datums\diseases\advance\symptoms\shedding.dm" #include "code\datums\diseases\advance\symptoms\shivering.dm" +#include "code\datums\diseases\advance\symptoms\skin.dm" #include "code\datums\diseases\advance\symptoms\sneeze.dm" #include "code\datums\diseases\advance\symptoms\stimulant.dm" #include "code\datums\diseases\advance\symptoms\symptoms.dm" -#include "code\datums\diseases\advance\symptoms\visionaid.dm" -#include "code\datums\diseases\advance\symptoms\visionloss.dm" -#include "code\datums\diseases\advance\symptoms\vitiligo.dm" +#include "code\datums\diseases\advance\symptoms\vision.dm" #include "code\datums\diseases\advance\symptoms\voice_change.dm" #include "code\datums\diseases\advance\symptoms\vomit.dm" #include "code\datums\diseases\advance\symptoms\weight.dm"