From 847229edd2720638d5d5d0bdaa7d2ad33bc77d4f Mon Sep 17 00:00:00 2001
From: pireamaineach <46943530+pireamaineach@users.noreply.github.com>
Date: Thu, 11 Jul 2019 16:55:50 +0100
Subject: [PATCH] Makes nuclear particles no longer give toxin damage directly.
 (#44990)

* Makes nuclear particles do stamina instead of toxin.

* Update nuclear_particle.dm

* Makes xray beams and nuclear particles roll for rad armour.
---
 code/modules/projectiles/projectile/beams.dm               | 1 +
 .../projectiles/projectile/energy/nuclear_particle.dm      | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 92b83aeea00..0c28fcf2d86 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -55,6 +55,7 @@
 /obj/item/projectile/beam/xray
 	name = "\improper X-ray beam"
 	icon_state = "xray"
+	flag = "rad"
 	damage = 15
 	irradiate = 300
 	range = 15
diff --git a/code/modules/projectiles/projectile/energy/nuclear_particle.dm b/code/modules/projectiles/projectile/energy/nuclear_particle.dm
index d7674f3a6ee..e08f806fe58 100644
--- a/code/modules/projectiles/projectile/energy/nuclear_particle.dm
+++ b/code/modules/projectiles/projectile/energy/nuclear_particle.dm
@@ -3,9 +3,8 @@
 	name = "nuclear particle"
 	icon_state = "nuclear_particle"
 	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
-	damage = 10
-	damage_type = TOX
-	irradiate = 2500 //enough to knockdown and induce vomiting
+	flag = "rad"
+	irradiate = 5000
 	speed = 0.4
 	hitsound = 'sound/weapons/emitter2.ogg'
 	impact_type = /obj/effect/projectile/impact/xray
@@ -27,4 +26,4 @@
 
 /atom/proc/fire_nuclear_particle(angle = rand(0,360)) //used by fusion to fire random nuclear particles. Fires one particle in a random direction.
 	var/obj/item/projectile/energy/nuclear_particle/P = new /obj/item/projectile/energy/nuclear_particle(src)
-	P.fire(angle)
\ No newline at end of file
+	P.fire(angle)