Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

This commit is contained in:
LetterN
2021-10-30 11:54:20 +08:00
362 changed files with 1167 additions and 1603 deletions

View File

@@ -172,7 +172,7 @@
if(enabled)
ui_interact(user)
else if(IsAdminGhost(user))
var/response = tgui_alert(user, "This computer is turned off. Would you like to turn it on?", "Admin Override", list("Yes", "No"))
var/response = alert(user, "This computer is turned off. Would you like to turn it on?", "Admin Override", "Yes", "No")
if(response == "Yes")
turn_on(user)