From 72d329cf3152cff8defffd99465dc5d4e9cba34a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 20 Jun 2017 10:00:21 -0500 Subject: [PATCH] Makes RADIMMUNE species incompatible with radiation based DNA injectors (#1518) --- code/game/objects/items/weapons/dna_injector.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index ecc8d3a362..433ff2a702 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -30,7 +30,7 @@ /obj/item/weapon/dnainjector/proc/inject(mob/living/carbon/M, mob/user) prepare() - if(M.has_dna() && !(M.disabilities & NOCLONE)) + if(M.has_dna() && !(RADIMMUNE in M.dna.species.species_traits) && !(M.disabilities & NOCLONE)) M.radiation += rand(20/(damage_coeff ** 2),50/(damage_coeff ** 2)) var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]" for(var/datum/mutation/human/HM in remove_mutations)