From 43c7959ca9da06dab9348306bd15c741ea1e0315 Mon Sep 17 00:00:00 2001 From: san7890 Date: Fri, 30 Sep 2022 07:21:08 -0600 Subject: [PATCH] Nuclear Operatives Can Now Correctly Get Servant Golems (#70142) Nuclear Operatives Can Now Correctly Get Servant Golems --- code/modules/antagonists/nukeop/nukeop.dm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm index a4cf09b76f6..e9e8d4b3ded 100644 --- a/code/modules/antagonists/nukeop/nukeop.dm +++ b/code/modules/antagonists/nukeop/nukeop.dm @@ -28,11 +28,15 @@ /datum/antagonist/nukeop/proc/equip_op() if(!ishuman(owner.current)) return - var/mob/living/carbon/human/H = owner.current - H.set_species(/datum/species/human) //Plasamen burn up otherwise, and lizards are vulnerable to asimov AIs + var/mob/living/carbon/human/operative = owner.current - H.equipOutfit(nukeop_outfit) + if(!nukeop_outfit) // this variable is null in instances where an antagonist datum is granted via enslaving the mind (/datum/mind/proc/enslave_mind_to_creator), like in golems. + return + + operative.set_species(/datum/species/human) //Plasmamen burn up otherwise, and besides, all other species are vulnerable to asimov AIs. Let's standardize all operatives being human. + + operative.equipOutfit(nukeop_outfit) return TRUE /datum/antagonist/nukeop/greet()