shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makes RADIMMUNE species incompatible with radiation based DNA injectors (#1518)

Browse Source
This commit is contained in:
CitadelStationBot
2017-06-20 08:00:21 -07:00
committed by kevinz000
parent 6ef01170ac
commit 72d329cf31
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/dna_injector.dm
+1 -1
View File
@@ -30,7 +30,7 @@
/obj/item/weapon/dnainjector/proc/inject(mob/living/carbon/M, mob/user) /obj/item/weapon/dnainjector/proc/inject(mob/living/carbon/M, mob/user)
prepare() 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)) M.radiation += rand(20/(damage_coeff ** 2),50/(damage_coeff ** 2))
var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]" var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]"
for(var/datum/mutation/human/HM in remove_mutations) for(var/datum/mutation/human/HM in remove_mutations)