mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 21:18:37 +01:00
Merge remote-tracking branch 'origin/master' into upstream-merge-82833
This commit is contained in:
@@ -84,7 +84,7 @@ PROCESSING_SUBSYSTEM_DEF(dcs)
|
||||
fullid += REF(key)
|
||||
|
||||
if(named_arguments)
|
||||
named_arguments = sortTim(named_arguments, GLOBAL_PROC_REF(cmp_text_asc))
|
||||
sortTim(named_arguments, GLOBAL_PROC_REF(cmp_text_asc))
|
||||
fullid += named_arguments
|
||||
|
||||
return list2params(fullid)
|
||||
|
||||
@@ -135,10 +135,7 @@ GLOBAL_VAR_INIT(revolutionary_win, FALSE)
|
||||
|
||||
/datum/dynamic_ruleset/roundstart/traitorbro/execute()
|
||||
for (var/datum/mind/mind in assigned)
|
||||
var/datum/team/brother_team/team = new
|
||||
team.add_member(mind)
|
||||
team.forge_brother_objectives()
|
||||
mind.add_antag_datum(/datum/antagonist/brother, team)
|
||||
new /datum/team/brother_team(mind)
|
||||
GLOB.pre_setup_antags -= mind
|
||||
|
||||
return TRUE
|
||||
|
||||
@@ -53,7 +53,7 @@ SUBSYSTEM_DEF(lua)
|
||||
world.SetConfig("env", "LUAU_PATH", jointext(lua_path, ";"))
|
||||
|
||||
/datum/controller/subsystem/lua/Shutdown()
|
||||
AUXTOOLS_SHUTDOWN(AUXLUA)
|
||||
AUXTOOLS_FULL_SHUTDOWN(AUXLUA)
|
||||
|
||||
/datum/controller/subsystem/lua/proc/queue_resume(datum/lua_state/state, index, arguments)
|
||||
if(!initialized)
|
||||
|
||||
Reference in New Issue
Block a user