cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

particles should actually dmg properly, instead of error. cant believe this didnt come up earlier

Browse Source 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-07-28 21:40:07 +10:00
parent bd4ce09264
commit 09687957d9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/particle_accelerator/particle.dm
+6 -5
View File
@@ -39,16 +39,16 @@
if (A)
if(ismob(A))
toxmob(A)
if((istype(A,/obj/machinery/the_singularitygen))||(istype(A,/obj/machinery/singularity/)))
else if((istype(A,/obj/machinery/the_singularitygen))||(istype(A,/obj/machinery/singularity/)))
A:energy += energy
// energy = 0 //This breaks the current singularity
if( istype(A,/obj/machinery/rust/particle_catcher) )
else if( istype(A,/obj/machinery/rust/particle_catcher) )
var/obj/machinery/rust/particle_catcher/collided_catcher = A
if(particle_type && particle_type != "neutron")
if(collided_catcher.AddParticles(particle_type, 1 + additional_particles))
collided_catcher.parent.AddEnergy(energy,mega_energy)
del (src)
if( istype(A,/obj/machinery/rust/core) )
else if( istype(A,/obj/machinery/rust/core) )
var/obj/machinery/rust/core/collided_core = A
if(particle_type && particle_type != "neutron")
if(collided_core.AddParticles(particle_type, 1 + additional_particles))
@@ -73,6 +73,7 @@
proc
toxmob(var/mob/living/M)
var/radiation = (energy*2)
M.adjustToxLoss(radiation)
/* if(istype(M,/mob/living/carbon/human))
if(M:wear_suit) //TODO: check for radiation protection
radiation = round(radiation/2,1)
@@ -80,10 +81,10 @@
if(M:wear_suit) //TODO: check for radiation protection
radiation = round(radiation/2,1)*/
if(ionizing)
M.apply_effects((radiation*3),IRRADIATE,0)
M.apply_effect((radiation*3),IRRADIATE,0)
M.updatehealth()
else
M.apply_effects((radiation*2),IRRADIATE,0)
M.apply_effect((radiation*2),IRRADIATE,0)
M.updatehealth()
//M << "\red You feel odd."
return