Skip to content

Commit

Permalink
Merge pull request tgstation#16075 from KorPhaeron/nuke_ops
Browse files Browse the repository at this point in the history
Fixes nuke ops spawning as plasmamen and exploding
  • Loading branch information
ChangelingRain committed Mar 17, 2016
2 parents dbc53e0 + 35a34a5 commit e63b0bc
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions code/game/gamemodes/nuclear/nuclear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@
synd_mind.assigned_role = "Syndicate"
synd_mind.special_role = "Syndicate"//So they actually have a special role/N
log_game("[synd_mind.key] (ckey) has been selected as a nuclear operative")
if(ishuman(synd_mind.current))//don't want operatives burning to death instantly.
var/mob/living/carbon/human/human = synd_mind.current
if(human.dna && human.dna.species.dangerous_existence)
human.set_species(/datum/species/human)

return 1

Expand Down Expand Up @@ -162,6 +158,8 @@
return

/datum/game_mode/proc/equip_syndicate(mob/living/carbon/human/synd_mob, telecrystals = TRUE)
synd_mob.set_species(/datum/species/human) //Plasamen burn up otherwise, and lizards are vulnerable to asimov AIs

if(telecrystals)
synd_mob.equipOutfit(/datum/outfit/syndicate)
else
Expand Down

0 comments on commit e63b0bc

Please sign in to comment.