Merge pull request #7489 from Citadel-Station-13/nanites

Nanites port

code/modules/surgery/advanced/brainwashing.dm

@@ -40,7 +40,7 @@
 	if(!target.mind)
 		user.visible_message("[target] doesn't respond to the brainwashing, as if [target.p_they()] lacked a mind...")
 		return FALSE
-	if(target.isloyal())
+	if(target.has_trait(TRAIT_MINDSHIELD))
 		user.visible_message("You hear a faint buzzing from a device inside [target]'s brain, and the brainwashing is erased.")
 		return FALSE
 	user.visible_message("[user] successfully brainwashes [target]!", "<span class='notice'>You succeed in brainwashing [target].</span>")