Merge pull request #11769 from phil235/FixMutations

Some dna fixes
This commit is contained in:
Razharas
2015-09-15 22:31:59 +03:00
31 changed files with 968 additions and 961 deletions
+1 -1
View File
@@ -431,7 +431,7 @@
var/failed = null
if (H.suiciding || (NOCLONE in H.mutations))
if (H.suiciding || (H.disabilities & NOCLONE))
failed = "<span class='warning'>[defib] buzzes: Resuscitation failed - Recovery of patient impossible. Further attempts futile.</span>"
else if ((tplus > tlimit) || !H.getorgan(/obj/item/organ/internal/heart))
failed = "<span class='warning'>[defib] buzzes: Resuscitation failed - Heart tissue damage beyond point of no return. Further attempts futile.</span>"
@@ -17,7 +17,7 @@
/obj/item/weapon/dnainjector/proc/inject(mob/living/carbon/M, mob/user)
if(check_dna_integrity(M) && !(NOCLONE in M.mutations))
if(check_dna_integrity(M) && !(M.disabilities & NOCLONE))
if(M.stat == DEAD) //prevents dead people from having their DNA changed
user << "<span class='notice'>You can't modify [M]'s DNA while \he's dead.</span>"
return