From 66cf95be48b9205115c37a9f0415ab4bf61ab789 Mon Sep 17 00:00:00 2001 From: Crazylemon Date: Thu, 24 Sep 2015 16:08:59 -0700 Subject: [PATCH] Used apply_effect for all radiation effects --- code/game/mecha/equipment/tools/tools.dm | 5 +--- .../computer3/computers/scanconsole.dm | 30 +++++++++---------- .../media/broadcast/transmitters/broadcast.dm | 5 +--- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 05ae2c9b125..f80fe007d26 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -999,10 +999,7 @@ process(var/obj/item/mecha_parts/mecha_equipment/generator/nuclear/EG) if(..()) for(var/mob/living/carbon/M in view(EG.chassis)) - if(istype(M,/mob/living/carbon/human)) - M.apply_effect((EG.rad_per_cycle*3),IRRADIATE,0) - else - M.radiation += EG.rad_per_cycle + M.apply_effect((EG.rad_per_cycle*3),IRRADIATE,0) return 1 diff --git a/code/modules/computer3/computers/scanconsole.dm b/code/modules/computer3/computers/scanconsole.dm index 3092f51fb80..46968ea8639 100644 --- a/code/modules/computer3/computers/scanconsole.dm +++ b/code/modules/computer3/computers/scanconsole.dm @@ -452,7 +452,7 @@ result += temp scanner.occupant.dna.uni_identity = setblock(ui, ui_block, result,3) updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity) - scanner.occupant.radiation += (radstrength+radduration) + scanner.occupant.apply_effect(radstrength+radduration, IRRADIATE) if("ui-f") if (prob(20+radstrength)) randmutb(scanner.occupant) @@ -460,7 +460,7 @@ else randmuti(scanner.occupant) updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity) - scanner.occupant.radiation += ((radstrength*2)+radduration) + scanner.occupant.apply_effect((radstrength*2)+radduration, IRRADIATE) if("se") var/se = scanner.occupant.dna.struc_enzymes @@ -482,7 +482,7 @@ scanner.occupant.dna.struc_enzymes = setblock(se, se_block, result,3) domutcheck(scanner.occupant,scanner) - scanner.occupant.radiation += (radstrength+radduration) + scanner.occupant.apply_effect(radstrength+radduration, IRRADIATE) if("se-f") if (prob(80-radduration)) randmutb(scanner.occupant) @@ -490,7 +490,7 @@ else randmuti(scanner.occupant) updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity) - scanner.occupant.radiation += ((radstrength*2)+radduration) + scanner.occupant.apply_effect((radstrength*2)+radduration, IRRADIATE) if(null) if (prob(95)) @@ -503,7 +503,7 @@ randmutg(scanner.occupant) else randmuti(scanner.occupant) - scanner.occupant.radiation += ((radstrength*3)+radduration*3) + scanner.occupant.apply_effect((radstrength*3)+radduration*3, IRRADIATE) scanner.locked = lock_state @@ -587,7 +587,7 @@ randmutg(scanner.occupant) else randmuti(scanner.occupant) - scanner.occupant.radiation += ((radstrength*3)+radduration*3) + scanner.occupant.apply_effect((radstrength*3)+radduration*3, IRRADIATE) scanner.locked = lock_state temp_html = null dopage(src,"screen=radsetmenu") @@ -716,7 +716,7 @@ tstructure2 = setblock(scanner.occupant.dna.uni_identity, ui_block, newblock,3) scanner.occupant.dna.uni_identity = tstructure2 updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity) - scanner.occupant.radiation += (radstrength+radduration) + scanner.occupant.apply_effect(radstrength+radduration, IRRADIATE) else if (prob(20+radstrength)) randmutb(scanner.occupant) @@ -724,7 +724,7 @@ else randmuti(scanner.occupant) updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity) - scanner.occupant.radiation += ((radstrength*2)+radduration) + scanner.occupant.apply_effect((radstrength*2)+radduration, IRRADIATE) scanner.locked = lock_state dopage(src,"screen=unimenu") @@ -810,7 +810,7 @@ tstructure2 = setblock(scanner.occupant.dna.struc_enzymes, se_block, newblock,3) scanner.occupant.dna.struc_enzymes = tstructure2 domutcheck(scanner.occupant,scanner) - scanner.occupant.radiation += (radstrength+radduration) + scanner.occupant.apply_effect(radstrength+radduration, IRRADIATE) se_block = oldblock else // @@ -822,7 +822,7 @@ tstructure2 = setblock(scanner.occupant.dna.struc_enzymes, se_block, newblock,3) scanner.occupant.dna.struc_enzymes = tstructure2 domutcheck(scanner.occupant,scanner) - scanner.occupant.radiation += (radstrength+radduration) + scanner.occupant.apply_effect(radstrength+radduration, IRRADIATE) else if (prob(80-radduration)) randmutb(scanner.occupant) @@ -830,7 +830,7 @@ else randmuti(scanner.occupant) updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity) - scanner.occupant.radiation += ((radstrength*2)+radduration) + scanner.occupant.apply_effect((radstrength*2)+radduration, IRRADIATE) scanner.locked = lock_state /// dopage(src,"screen=strucmenu") @@ -975,7 +975,7 @@ scanner.occupant.dna.struc_enzymes = buffer1 domutcheck(scanner.occupant,scanner) temp_html = "Transfered." - scanner.occupant.radiation += rand(20,50) + scanner.occupant.apply_effect(rand(20,50), IRRADIATE) if (href_list["b2transfer"]) if (!scanner.occupant || (NOCLONE in scanner.occupant.mutations) || !scanner.occupant.dna) @@ -990,7 +990,7 @@ scanner.occupant.dna.struc_enzymes = buffer2 domutcheck(scanner.occupant,scanner) temp_html = "Transfered." - scanner.occupant.radiation += rand(20,50) + scanner.occupant.apply_effect(rand(20,50), IRRADIATE) if (href_list["b3transfer"]) if (!scanner.occupant || (NOCLONE in scanner.occupant.mutations) || !scanner.occupant.dna) @@ -1005,7 +1005,7 @@ scanner.occupant.dna.struc_enzymes = buffer3 domutcheck(scanner.occupant,scanner) temp_html = "Transfered." - scanner.occupant.radiation += rand(20,50) + scanner.occupant.apply_effect(rand(20,50), IRRADIATE) if (href_list["b1injector"]) if (injectorready) @@ -1271,4 +1271,4 @@ popup.set_content(dat) popup.open() -*/ \ No newline at end of file +*/ diff --git a/code/modules/media/broadcast/transmitters/broadcast.dm b/code/modules/media/broadcast/transmitters/broadcast.dm index 8461eaaafb4..1a7ad15ed1e 100644 --- a/code/modules/media/broadcast/transmitters/broadcast.dm +++ b/code/modules/media/broadcast/transmitters/broadcast.dm @@ -164,10 +164,7 @@ // Radiation for(var/mob/living/carbon/M in view(src,3)) var/rads = RADS_PER_TICK * sqrt( 1 / (get_dist(M, src) + 1) ) - if(istype(M,/mob/living/carbon/human)) - M.apply_effect((rads*3),IRRADIATE) - else - M.radiation += rads + M.apply_effect((rads*3),IRRADIATE) // Heat output var/turf/simulated/L = loc