Merge pull request #11359 from Kyep/ipintel

Adds XKeyScore (from TG), forum link, removes old discord link
This commit is contained in:
Crazy Lemon
2019-05-30 19:57:18 -07:00
committed by GitHub
23 changed files with 519 additions and 148 deletions
+2 -2
View File
@@ -182,7 +182,8 @@
return 0
if(alert(src,"Are you sure you wish to observe? You cannot normally join the round after doing this!","Player Setup","Yes","No") == "Yes")
if(!client) return 1
if(!client)
return 1
var/mob/dead/observer/observer = new()
src << browse(null, "window=playersetup")
spawning = 1
@@ -220,7 +221,6 @@
if(!SSticker || SSticker.current_state != GAME_STATE_PLAYING)
to_chat(usr, "<span class='warning'>The round is either not ready, or has already finished...</span>")
return
if(client.prefs.species in GLOB.whitelisted_species)
if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist)