diff --git a/code/datums/dna.dm b/code/datums/dna.dm index a2982a3caf..43dad6cef8 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -386,6 +386,14 @@ qdel(language_holder) var/species_holder = initial(mrace.species_language_holder) language_holder = new species_holder(src) + + var/mob/living/carbon/human/H = src + //provide the user's additional language to the new language holder even if they change species + if(H.additional_language && H.additional_language != "None") + var/language_entry = GLOB.roundstart_languages[H.additional_language] + if(language_entry) + grant_language(language_entry, TRUE, TRUE) + update_atom_languages() /mob/living/carbon/human/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE) diff --git a/code/modules/antagonists/traitor/classes/traitor_class.dm b/code/modules/antagonists/traitor/classes/traitor_class.dm index 6aaa0b41c8..bcc6fc18dd 100644 --- a/code/modules/antagonists/traitor/classes/traitor_class.dm +++ b/code/modules/antagonists/traitor/classes/traitor_class.dm @@ -45,5 +45,5 @@ GLOBAL_LIST_EMPTY(traitor_classes) /datum/traitor_class/proc/clean_up_traitor(datum/antagonist/traitor/T) // Any effects that need to be cleaned up if traitor class is being swapped. -/datum/traitor_class/proc/on_process(/datum/antagonist/traitor/T) +/datum/traitor_class/proc/on_process(datum/antagonist/traitor/T) // only for processing traitor classes; runs once an SSprocessing tick diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 40640f1d5b..8b214e85a4 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -3080,6 +3080,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(additional_language && additional_language != "None") var/language_entry = GLOB.roundstart_languages[additional_language] if(language_entry) + character.additional_language = language_entry character.grant_language(language_entry, TRUE, TRUE) //limb stuff, only done when initially spawning in diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 429f00161b..1aa2863eda 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -176,7 +176,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) * Hair will always update its dir, so if your sprite has no dirs the haircut will go all over the place. * |- Ricotez */ -/mob/dead/observer/update_icon(new_form) +/mob/dead/observer/update_icon(updates=ALL, new_form=null) . = ..() if(client) //We update our preferences in case they changed right before update_icon was called. ghost_accs = client.prefs.ghost_accs diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index de934318b3..e15f5b8be0 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -81,6 +81,8 @@ tooltips = TRUE + var/additional_language //the additional language this human can speak from their preference selection + /// Unarmed parry data for human /datum/block_parry_data/unarmed/human parry_respect_clickdelay = TRUE diff --git a/html/changelog.html b/html/changelog.html index c1f8c58eaa..f5ea6285f1 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,29 @@ -->
+

03 September 2021

+

timothyteakettle updated:

+ + +

01 September 2021

+

BlueWildrose updated:

+ +

ma44 updated:

+ +

zeroisthebiggay updated:

+ +

28 August 2021

DeltaFire15 updated:

GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 78c21c6eff..bd62e1fcb0 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -29873,3 +29873,18 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. zeroisthebiggay: - rscdel: grilles as maintenance loot - rscadd: sevensune tail from hyperstation +2021-09-01: + BlueWildrose: + - bugfix: The waddle component now takes size into account when running rotating + animations, thus not reverting character sizes to default size. + ma44: + - bugfix: Weapon rechargers now have their recharger indicators again. + - bugfix: Energy guns now update when switching modes again. + - bugfix: Stabilized yellow slime extracts will now update cells and guns it recharges. + - rscadd: Weapon rechargers will now be more noticeable when it has finished recharging + something. + zeroisthebiggay: + - bugfix: the fucking chainsaw sprite +2021-09-03: + timothyteakettle: + - bugfix: fixes losing your additional language upon changing species diff --git a/html/changelogs/AutoChangeLog-pr-15045.yml b/html/changelogs/AutoChangeLog-pr-15045.yml deleted file mode 100644 index 8c31a67c5d..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15045.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "BlueWildrose" -delete-after: True -changes: - - bugfix: "The waddle component now takes size into account when running rotating animations, thus not reverting character sizes to default size." diff --git a/html/changelogs/AutoChangeLog-pr-15048.yml b/html/changelogs/AutoChangeLog-pr-15048.yml deleted file mode 100644 index 00bc53136b..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15048.yml +++ /dev/null @@ -1,10 +0,0 @@ -author: "ma44" -delete-after: True -changes: - - bugfix: "Weapon rechargers now have their recharger indicators again." - - bugfix: "Energy guns now update when switching modes again." - - bugfix: "Stabilized yellow slime extracts will now update cells and guns it recharges." - - bugfix: "Weapon rechargers now have their recharger indicators again." - - bugfix: "Energy guns now update when switching modes again." - - bugfix: "Stabilized yellow slime extracts will now update cells and guns it recharges." - - rscadd: "Weapon rechargers will now be more noticeable when it has finished recharging something." diff --git a/html/changelogs/AutoChangeLog-pr-15050.yml b/html/changelogs/AutoChangeLog-pr-15050.yml deleted file mode 100644 index 4dba5c40eb..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15050.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - bugfix: "the fucking chainsaw sprite" diff --git a/html/changelogs/AutoChangeLog-pr-15072.yml b/html/changelogs/AutoChangeLog-pr-15072.yml new file mode 100644 index 0000000000..8886aa2e96 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15072.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "Might've fixed some ghost sprite oddities nobody even knew about"