cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-16 09:34:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Radiation Fixes (#17141)

Browse Source 
* unbreaks radiation

* ye
This commit is contained in:
Cameron Lennox
2025-02-15 02:30:11 -05:00
committed by GitHub
parent 8c26ed816d
commit 6db4efd6a7
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/life.dm
+6 -6
View File
@@ -355,11 +355,11 @@
radiation -= 10 * RADIATION_SPEED_COEFFICIENT * species.rad_removal_mod
return
if (radiation < species.rad_levels["safe"]) //Less than 1.0 Gy. No side effects.
if (radiation < GLOB.radiation_levels[species.rad_levels]["safe"]) //Less than 1.0 Gy. No side effects.
radiation -= 10 * RADIATION_SPEED_COEFFICIENT * species.rad_removal_mod
accumulated_rads += 10 * RADIATION_SPEED_COEFFICIENT //No escape from accumulated rads.
else if (radiation >= species.rad_levels["safe"] && radiation < species.rad_levels["danger_1"]) //Equivalent of 1.0-2.0 Gy. Minimum stage you start seeing effects.
else if (radiation >= GLOB.radiation_levels[species.rad_levels]["safe"] && radiation < GLOB.radiation_levels[species.rad_levels]["danger_1"]) //Equivalent of 1.0-2.0 Gy. Minimum stage you start seeing effects.
damage = 1
radiation -= 10 * RADIATION_SPEED_COEFFICIENT * species.rad_removal_mod
accumulated_rads += 10 * RADIATION_SPEED_COEFFICIENT
@@ -376,7 +376,7 @@
if(prob(1) && prob(100 * RADIATION_SPEED_COEFFICIENT)) //Rare chance of vomiting.
spawn vomit()
else if (radiation >= species.rad_levels["danger_1"] && radiation < species.rad_levels["danger_2"]) //Equivalent of 2.0 to 6.0 Gy. Nobody should ever be above this without extreme negligence.
else if (radiation >= GLOB.radiation_levels[species.rad_levels]["danger_1"] && radiation < GLOB.radiation_levels[species.rad_levels]["danger_2"]) //Equivalent of 2.0 to 6.0 Gy. Nobody should ever be above this without extreme negligence.
damage = 3
radiation -= 30 * RADIATION_SPEED_COEFFICIENT * species.rad_removal_mod
accumulated_rads += 30 * RADIATION_SPEED_COEFFICIENT
@@ -392,7 +392,7 @@
to_chat(src, span_warning("You feel sick."))
AdjustWeakened(3)
else if (radiation >= species.rad_levels["danger_2"] && radiation < species.rad_levels["danger_3"]) //Equivalent of 6.0 to 8.0 Gy.
else if (radiation >= GLOB.radiation_levels[species.rad_levels]["danger_2"] && radiation < GLOB.radiation_levels[species.rad_levels]["danger_3"]) //Equivalent of 6.0 to 8.0 Gy.
damage = 5
radiation -= 50 * RADIATION_SPEED_COEFFICIENT * species.rad_removal_mod
accumulated_rads += 50 * RADIATION_SPEED_COEFFICIENT
@@ -413,7 +413,7 @@
I.take_damage(damage * species.radiation_mod * RADIATION_SPEED_COEFFICIENT)
else if (radiation >= species.rad_levels["danger_3"] && radiation < species.rad_levels["danger_4"]) //Equivalent of 8.0 to 30 Gy.
else if (radiation >= GLOB.radiation_levels[species.rad_levels]["danger_3"] && radiation < GLOB.radiation_levels[species.rad_levels]["danger_4"]) //Equivalent of 8.0 to 30 Gy.
damage = 10
radiation -= 100 * RADIATION_SPEED_COEFFICIENT * species.rad_removal_mod
accumulated_rads += 100 * RADIATION_SPEED_COEFFICIENT
@@ -443,7 +443,7 @@
if(istype(I)) I.add_autopsy_data("Radiation Induced Cancerous Growth", damage)
I.take_damage(damage * species.radiation_mod * RADIATION_SPEED_COEFFICIENT)
else if (radiation >= species.rad_levels["danger_4"]) //Above 30Gy. You had to get absolutely blasted with rads for this.
else if (radiation >= GLOB.radiation_levels[species.rad_levels]["danger_4"]) //Above 30Gy. You had to get absolutely blasted with rads for this.
damage = 30
radiation -= 300 * RADIATION_SPEED_COEFFICIENT * species.rad_removal_mod
accumulated_rads += 300 * RADIATION_SPEED_COEFFICIENT
code/modules/mob/living/carbon/human/species/species.dm
+1 -1
View File
@@ -236,7 +236,7 @@
var/list/env_traits = list()
var/pixel_offset_x = 0 // Used for offsetting 64x64 and up icons.
var/pixel_offset_y = 0 // Used for offsetting 64x64 and up icons.
var/rad_levels = list("safe" = 50, "danger_1" = 100, "danger_2" = 300, "danger_3" = 400, "danger_4" = 1500) //For handle_mutations_and_radiation
var/rad_levels = NORMAL_RADIATION_RESISTANCE //For handle_mutations_and_radiation
var/rad_removal_mod = 1
code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
+3 -3
View File
@@ -347,19 +347,19 @@
name = "Radiation Resistance"
desc = "You are generally more resistant to radiation, and it dissipates faster from your body."
cost = 1
var_changes = list("radiation_mod" = 0.65, "rad_removal_mod" = 3.5, "rad_levels" = list("safe" = 70, "danger_1" = 150, "danger_2" = 450, "danger_3" = 600, "danger_4" = 2250))
var_changes = list("radiation_mod" = 0.65, "rad_removal_mod" = 3.5, "rad_levels" = RESISTANT_RADIATION_RESISTANCE)
/datum/trait/positive/rad_resistance_extreme
name = "Radiation Resistance, Major"
desc = "You are much more resistant to radiation, and it dissipates much faster from your body."
cost = 2
var_changes = list("radiation_mod" = 0.5, "rad_removal_mod" = 5, "rad_levels" = list("safe" = 150, "danger_1" = 300, "danger_2" = 600, "danger_3" = 1000, "danger_4" = 3000))
var_changes = list("radiation_mod" = 0.5, "rad_removal_mod" = 5, "rad_levels" = MAJOR_RESISTANT_RADIATION_RESISTANCE)
/datum/trait/positive/rad_immune
name = "Radiation Immunity"
desc = "For whatever reason, be it a more dense build or some quirk of your genetic code, your body is completely immune to radiation."
cost = 3
var_changes = list("radiation_mod" = 0.0, "rad_removal_mod" = 10, "rad_levels" = list("safe" = 10000, "danger_1" = 10001, "danger_2" = 10002, "danger_3" = 10003, "danger_4" = 10004))
var_changes = list("radiation_mod" = 0.0, "rad_removal_mod" = 10, "rad_levels" = IMMUNITY_RADIATION_RESISTANCE)
// Traitgenes
is_genetrait = TRUE