mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-22 12:29:46 +01:00
Update MC (#18112)
* sdf * fsda * fuck * fuck2 * toolz * sdaf * sdfa * saf * sdfa * sdfa * sdf * sdfa * temp rename * temp rename * temp rename * sdaf * the pain is immensurable in the land of byond * the curse of rah * safd * sadf * sadf * gf * asf * fssdfa * sfd * sadf * sfda * brah * brah * it's easier for you to fix this * ffs * brah * brah
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
//DVIEW is a hack that uses a mob with darksight in order to find lists of viewable stuff while ignoring darkness
|
||||
// Defines for dview are elsewhere.
|
||||
|
||||
var/mob/abstract/dview/dview_mob = new
|
||||
GLOBAL_DATUM_INIT(dview_mob, /mob/abstract/dview, new)
|
||||
|
||||
/mob/abstract/dview
|
||||
see_in_dark = 1e6
|
||||
@@ -23,5 +23,5 @@ var/mob/abstract/dview/dview_mob = new
|
||||
|
||||
world.log << "Dview was force-qdeleted, this should never happen!"
|
||||
|
||||
dview_mob = new
|
||||
GLOB.dview_mob = new
|
||||
return QDEL_HINT_QUEUE
|
||||
|
||||
@@ -91,7 +91,7 @@
|
||||
if(length(current_map.lobby_screens))
|
||||
if(current_map.lobby_transitions && isnum(current_map.lobby_transitions))
|
||||
icon_state = current_map.lobby_screens[lobby_index]
|
||||
if(Master.initializing)
|
||||
if(!MC_RUNNING())
|
||||
spawn(current_map.lobby_transitions)
|
||||
Update()
|
||||
else
|
||||
@@ -119,7 +119,7 @@
|
||||
lobby_index = 1
|
||||
animate(src, alpha = 0, time = 1 SECOND)
|
||||
animate(alpha = 255, icon_state = current_map.lobby_screens[lobby_index], time = 1 SECOND)
|
||||
if(Master.initializing)
|
||||
if(!MC_RUNNING())
|
||||
spawn(current_map.lobby_transitions)
|
||||
Update()
|
||||
else
|
||||
|
||||
@@ -234,7 +234,7 @@
|
||||
|
||||
/datum/preferences/proc/return_chosen_high_job(var/title = FALSE)
|
||||
var/datum/job/chosenJob
|
||||
if(SSjobs.init_state < SS_INITSTATE_DONE)
|
||||
if(!SSjobs.initialized)
|
||||
return
|
||||
|
||||
if(job_civilian_low & ASSISTANT)
|
||||
|
||||
@@ -195,7 +195,7 @@
|
||||
*
|
||||
* Does NOT make it the default language
|
||||
*
|
||||
* * language - The language to add, can either be a `/datum/language` or a string, see the LANGUAGE_* defines in `code\__defines\species_languages.dm` for the strings
|
||||
* * language - The language to add, can either be a `/datum/language` or a string, see the LANGUAGE_* defines in `code\__DEFINES\species_languages.dm` for the strings
|
||||
*/
|
||||
/mob/proc/add_language(language)
|
||||
SHOULD_NOT_SLEEP(TRUE)
|
||||
@@ -218,7 +218,7 @@
|
||||
/**
|
||||
* Set default language for a `/mob/living`, return `TRUE` if set successfully, `FALSE` otherwise
|
||||
*
|
||||
* * language - The language to set as default, can either be a `/datum/language`, a string as per `LANGUAGE_*` defines in `code\__defines\species_languages.dm`,
|
||||
* * language - The language to set as default, can either be a `/datum/language`, a string as per `LANGUAGE_*` defines in `code\__DEFINES\species_languages.dm`,
|
||||
* or `null` to remove the default language
|
||||
*/
|
||||
/mob/living/proc/set_default_language(language)
|
||||
|
||||
Reference in New Issue
Block a user