Merge pull request #13379 from AffectedArc07/travis-fix-just-shoot-me-please

Fixes part of Travis I forgot about
This commit is contained in:
Fox McCloud
2020-05-05 18:54:55 -04:00
committed by GitHub
10 changed files with 36 additions and 38 deletions
+5 -5
View File
@@ -1,4 +1,4 @@
var/obj/machinery/gateway/centerstation/the_gateway = null
GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null)
/obj/machinery/gateway
name = "gateway"
desc = "A mysterious gateway built by unknown hands, it allows for faster than light travel to far-flung locations."
@@ -41,8 +41,8 @@ var/obj/machinery/gateway/centerstation/the_gateway = null
/obj/machinery/gateway/centerstation/New()
..()
if(!the_gateway)
the_gateway = src
if(!GLOB.the_gateway)
GLOB.the_gateway = src
/obj/machinery/gateway/centerstation/Initialize()
..()
@@ -54,8 +54,8 @@ var/obj/machinery/gateway/centerstation/the_gateway = null
return
/obj/machinery/gateway/centerstation/Destroy()
if(the_gateway == src)
the_gateway = null
if(GLOB.the_gateway == src)
GLOB.the_gateway = null
return ..()
/obj/machinery/gateway/centerstation/update_icon()
@@ -489,7 +489,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
dat += "<b>You are banned from special roles.</b>"
be_special = list()
else
for(var/i in special_roles)
for(var/i in GLOB.special_roles)
if(jobban_isbanned(user, i))
dat += "<b>Be [capitalize(i)]:</b> <font color=red><b> \[BANNED]</b></font><br>"
else if(!player_old_enough_antag(user.client, i))
@@ -2023,7 +2023,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
if("be_special")
var/r = href_list["role"]
if(r in special_roles)
if(r in GLOB.special_roles)
be_special ^= r
if("name")
@@ -84,7 +84,7 @@
// Might as well scrub out any malformed be_special list entries while we're here
for(var/role in be_special)
if(!(role in special_roles))
if(!(role in GLOB.special_roles))
log_runtime(EXCEPTION("[C.key] had a malformed role entry: '[role]'. Removing!"), src)
be_special -= role