cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-12 07:35:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11191 from PsiOmegaDelta/150925-RadioActivity

Browse Source 
Makes more sources of radiation respect rad-protection.
This commit is contained in:
mwerezak
2015-09-26 20:10:47 -05:00
parent 7abde2260b a3b9ab1236
commit 21f679ea8f
10 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/dna_injector.dm
+2 -1
View File
@@ -65,7 +65,8 @@
/obj/item/weapon/dnainjector/proc/inject(mob/M as mob, mob/user as mob)
if(istype(M,/mob/living))
M.radiation += rand(5,20)
var/mob/living/L = M
L.apply_effect(rand(5,20), IRRADIATE, check_protection = 0)
if (!(NOCLONE in M.mutations)) // prevents drained people from having their DNA changed
if (buf.types & DNA2_BUF_UI)