Clean up runtime errors, fix VueUIs opening offscreen (#14025)

* Clean up runtime errors, fix VueUIs opening offscreen

* woops

* myazaki is based
This commit is contained in:
Wildkins
2022-05-20 12:36:14 -04:00
committed by GitHub
parent da0000f7f2
commit 2bb8db37b9
14 changed files with 51 additions and 22 deletions
@@ -43,4 +43,6 @@
// Setup cargo spawn lists.
setup_cargo_spawn_lists()
click_catchers = create_click_catcher()
..()
@@ -32,8 +32,6 @@
if (config.use_forumuser_api)
update_admins_from_api(TRUE)
click_catchers = create_click_catcher()
..(timeofday)
/proc/sorted_add_area(area/A)
+5 -5
View File
@@ -36,7 +36,7 @@ var/datum/controller/subsystem/mapping/SSmapping
var/list/filelist = flist(path)
for(var/map in filelist)
var/datum/map_template/T = new(path = "[path][map]", rename = "[map]")
map_templates[T.name] = T
map_templates[T.id] = T
preloadBlacklistableTemplates()
/datum/controller/subsystem/mapping/proc/preloadBlacklistableTemplates()
@@ -62,15 +62,15 @@ var/datum/controller/subsystem/mapping/SSmapping
if(list_find(banned_maps, mappath))
continue
map_templates[MT.name] = MT
map_templates[MT.id] = MT
// This is nasty..
if(istype(MT, /datum/map_template/ruin/exoplanet))
exoplanet_ruins_templates[MT.name] = MT
exoplanet_ruins_templates[MT.id] = MT
else if(istype(MT, /datum/map_template/ruin/space))
space_ruins_templates[MT.name] = MT
space_ruins_templates[MT.id] = MT
else if(istype(MT, /datum/map_template/ruin/away_site))
away_sites_templates[MT.name] = MT
away_sites_templates[MT.id] = MT
/proc/generateMapList(filename)
var/list/potentialMaps = list()
+7 -3
View File
@@ -352,7 +352,7 @@ var/datum/controller/subsystem/ticker/SSticker
if(!istype(prefs) || force_name)
// trawl the whole list - we only do this on logout or job swap, aka when we can't guarantee the job datum being accurate
for(var/dept in ready_player_jobs)
if(LAZYISIN(ready_player_jobs[dept], ident))
if(!. && LAZYISIN(ready_player_jobs[dept], ident))
. = TRUE
ready_player_jobs[dept] -= ident
if(.)
@@ -361,10 +361,14 @@ var/datum/controller/subsystem/ticker/SSticker
var/datum/job/ready_job = prefs.return_chosen_high_job()
if(!istype(ready_job))
// literally how
return FALSE
for(var/dept in ready_job.departments)
if(ready_player_jobs[dept][prefs.real_name])
if(!. && ready_player_jobs[dept][prefs.real_name])
. = TRUE
LAZYREMOVE(ready_player_jobs[dept], prefs.real_name)
ready_player_jobs[dept] -= prefs.real_name
if(.)
update_ready_count()