From 86505bcad0f707eb4936759eadc2a46bde9c4dfb Mon Sep 17 00:00:00 2001 From: Shadowlight213 Date: Thu, 8 Sep 2016 19:19:17 -0700 Subject: [PATCH] More radstorm balance changes (#20357) * Removes direct tox loss from radstorm Adds a radiation alarm status display icon Makes radiation protection lower the mutation chance * wording changes * return --- code/datums/weather/weather_types.dm | 51 +++++++++++++++++++-------- icons/obj/status_display.dmi | Bin 25650 -> 26046 bytes 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/code/datums/weather/weather_types.dm b/code/datums/weather/weather_types.dm index 535f882d4bf..9f75bf714e6 100644 --- a/code/datums/weather/weather_types.dm +++ b/code/datums/weather/weather_types.dm @@ -118,7 +118,7 @@ name = "radiation storm" desc = "A cloud of intense radiation passes through the area dealing rad damage to those who are unprotected." - telegraph_duration = 600 + telegraph_duration = 400 telegraph_message = "The air begins to grow warm." weather_message = "You feel waves of heat wash over you! Find shelter!" @@ -137,28 +137,49 @@ immunity_type = "rad" +/datum/weather/rad_storm/telegraph() + ..() + status_alarm("alert") + + /datum/weather/rad_storm/impact(mob/living/L) - if(prob(20)) + var/resist = L.getarmor(null, "rad") + if(prob(40)) if(ishuman(L)) var/mob/living/carbon/human/H = L if(H.dna && H.dna.species) if(!(RADIMMUNE in H.dna.species.specflags)) - if(prob(50)) + if(prob(max(0,100-resist))) randmuti(H) - if(prob(90)) - randmutb(H) - else - randmutg(H) - H.domutcheck() + if(prob(50)) + if(prob(90)) + randmutb(H) + else + randmutg(H) + H.domutcheck() L.rad_act(20,1) - L.adjustToxLoss(4) - - - - - /datum/weather/rad_storm/end() if(..()) return - priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert") \ No newline at end of file + priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert") + status_alarm() + + +/datum/weather/rad_storm/proc/status_alarm(command) //Makes the status displays show the radiation warning for those who missed the announcement. + var/datum/radio_frequency/frequency = SSradio.return_frequency(1435) + + if(!frequency) + return + + var/datum/signal/status_signal = new + var/atom/movable/virtualspeaker/virt = PoolOrNew(/atom/movable/virtualspeaker,null) + status_signal.source = virt + status_signal.transmission_method = 1 + status_signal.data["command"] = "shuttle" + + if(command == "alert") + status_signal.data["command"] = "alert" + status_signal.data["picture_state"] = "radiation" + + frequency.post_signal(src, status_signal) \ No newline at end of file diff --git a/icons/obj/status_display.dmi b/icons/obj/status_display.dmi index 76f18ba5e65f7eea4dfb972c488fef581d6182dc..2c407ce049fe8973ac1bdf537a25eda7dbc9f967 100644 GIT binary patch delta 5754 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 F{1-*^X378n delta 5355 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