Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Increases most radiation dose amounts" #16445

Merged
merged 1 commit into from Jul 28, 2021
Merged

Revert "Increases most radiation dose amounts" #16445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions code/__DEFINES/radiation.dm
View file
Open in desktop
Expand Up @@ -53,5 +53,3 @@ Ask ninjanomnom if they're around

#define RAD_GEIGER_MEASURE_SMOOTHING 5
#define RAD_GEIGER_GRACE_PERIOD 2

#define RAD_DOSAGE_MULTIPLIER 10 // This is used to increase radiation dosage taken during rad_act() calls
2 changes: 1 addition & 1 deletion code/modules/mob/living/damage_procs.dm
View file
Open in desktop
Expand Up @@ -87,7 +87,7 @@
Paralyse(effect * blocked)
if(IRRADIATE)
if(!HAS_TRAIT(src, TRAIT_RADIMMUNE))
radiation += max((effect * RAD_DOSAGE_MULTIPLIER) * blocked, 0)
radiation += max(effect * blocked, 0)
if(SLUR)
Slur(effect * blocked)
if(STUTTER)
Expand Down
2 changes: 0 additions & 2 deletions code/modules/mob/living/living.dm
View file
Open in desktop
Expand Up @@ -989,8 +989,6 @@

amount -= RAD_BACKGROUND_RADIATION // This will always be at least 1 because of how skin protection is calculated

amount *= RAD_DOSAGE_MULTIPLIER

var/blocked = getarmor(null, "rad")

if(amount > RAD_BURN_THRESHOLD)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/power/supermatter/supermatter.dm
View file
Open in desktop
Expand Up @@ -329,7 +329,7 @@
//Hilariously enough, running into a closet should make you get hit the hardest.
var/mob/living/carbon/human/H = mob
H.hallucination += max(50, min(300, DETONATION_HALLUCINATION * sqrt(1 / (get_dist(mob, src) + 1))))
var/rads = (DETONATION_RADS * (sqrt(1 / (get_dist(L, src) + 1)) * sqrt(power / 5))) / (RAD_DOSAGE_MULTIPLIER * 0.25)
var/rads = DETONATION_RADS * sqrt(1 / (get_dist(L, src) + 1))
L.rad_act(rads)

var/turf/T = get_turf(src)
Expand Down Expand Up @@ -542,7 +542,7 @@
l.hallucination += power * hallucination_power * D
l.hallucination = clamp(l.hallucination, 0, 200)
for(var/mob/living/l in range(src, round((power / 100) ** 0.25)))
var/rads = ((power / 10) * sqrt( 1 / max(get_dist(l, src), 1) )) / RAD_DOSAGE_MULTIPLIER //RAD_DOSAGE_MULTIPLIER is used so that the SM doesn't absolutely murder you with rads
var/rads = (power / 10) * sqrt( 1 / max(get_dist(l, src), 1) )
l.rad_act(rads)

//Transitions between one function and another, one we use for the fast inital startup, the other is used to prevent errors with fusion temperatures.
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/chemistry/reagents/toxins.dm
View file
Open in desktop
Expand Up @@ -159,7 +159,7 @@
taste_description = "the colour blue and regret"

/datum/reagent/radium/on_mob_life(mob/living/M)
if(M.radiation < 800)
if(M.radiation < 80)
M.apply_effect(4, IRRADIATE)
return ..()

Expand Down