Merge pull request #5038 from Citadel-Station-13/upstream-merge-34466

[MIRROR] Fake nuclear disks are even more convincing
This commit is contained in:
LetterJay
2018-01-25 13:41:02 -06:00
committed by GitHub
6 changed files with 48 additions and 39 deletions
+1 -1
View File
@@ -67,7 +67,7 @@
/datum/antagonist/nukeop/proc/assign_nuke()
if(nuke_team && !nuke_team.tracked_nuke)
nuke_team.memorized_code = random_nukecode()
var/obj/machinery/nuclearbomb/nuke = locate("syndienuke") in GLOB.nuke_list
var/obj/machinery/nuclearbomb/syndicate/nuke = locate() in GLOB.nuke_list
if(nuke)
nuke_team.tracked_nuke = nuke
if(nuke.r_code == "ADMIN")