cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-22 12:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

Browse Source
This commit is contained in:
SandPoot
2023-10-12 02:40:12 -03:00
parent 42d03cb5ae c4c57d3e26
commit ee163aae68
14 changed files with 177 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/language.dm
+3 -3
View File
@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(language)
name = "Language"
init_order = INIT_ORDER_LANGUAGE
flags = SS_NO_FIRE
var/list/languages_by_name = list() //SKYRAT CHANGE - language bullshit
var/list/languages_by_name = list() //Sandstorm CHANGE - language bullshit
/datum/controller/subsystem/language/Initialize(timeofday)
for(var/L in subtypesof(/datum/language))
@@ -15,8 +15,8 @@ SUBSYSTEM_DEF(language)
var/datum/language/instance = new language
GLOB.language_datum_instances[language] = instance
//skyrat change
languages_by_name[initial(language.name)] = new language
//Sandstorm change
languages_by_name[initial(language.name)] = instance
//
return ..()
code/controllers/subsystem/ticker.dm
+1 -1
View File
@@ -407,7 +407,7 @@ SUBSYSTEM_DEF(ticker)
SSjob.EquipRank(N, player.mind.assigned_role, 0)
if(CONFIG_GET(flag/roundstart_traits) && ishuman(N.new_character))
SSquirks.AssignQuirks(N.new_character, N.client, TRUE, TRUE, SSjob.GetJob(player.mind.assigned_role), FALSE, N)
//skyrat change
//sandstorm change
if(ishuman(N.new_character))
SSlanguage.AssignLanguage(N.new_character, N.client)
//