Adds a proper TRAIT_RADIMMUNE check to the portable scanner and cloner. (#42489)

* ok

hi

* Add TRAIT_RADIMMUNE check to the portable gene scanner and to cloning

* Add TRAIT_RADIMMUNE check to the portable gene scanner and to cloning

* Implemented Suggestions.

* "No Sir, im not a synth, check my DNA!"

* You got it Boss

* Remove a useless Return

Co-Authored-By: Gousaid67 <gousaid67@gmail.com>

* Add a comment, also rerun checks
This commit is contained in:
Erik
2019-01-25 03:33:16 +11:00
committed by Jordie
parent 7aa13b8ef6
commit 517128a53f
3 changed files with 15 additions and 11 deletions
+7 -3
View File
@@ -673,11 +673,15 @@ NANITE SCANNER
var/list/discovered = list() //hit a dna console to update the scanners database
/obj/item/sequence_scanner/attack(mob/living/M, mob/living/carbon/human/user)
user.visible_message("<span class='notice'>[user] has analyzed [M]'s genetic sequence.</span>")
add_fingerprint(user)
if (!M.has_trait(TRAIT_RADIMMUNE) && !M.has_trait(TRAIT_BADDNA)) //no scanning if its a husk or DNA-less Species
user.visible_message("<span class='notice'>[user] has analyzed [M]'s genetic sequence.</span>")
gene_scan(M, user, src)
else
gene_scan(M, user, src)
user.visible_message("<span class='notice'>[user] failed to analyse [M]'s genetic sequence.</span>", "<span class='warning'>[M] has no readable genetic sequence!</span>")
/obj/item/sequence_scanner/afterattack(obj/O, mob/user, proximity)
. = ..()