Merge remote-tracking branch 'upstream/master'

2021-09-03 13:31:49 -04:00
parent cadfae679a b895c24cb4
commit 6b6034d34d
11 changed files with 55 additions and 49 deletions
@@ -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)
@@ -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
@@ -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
@@ -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
@@ -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
@@ -50,6 +50,29 @@
 		-->
 		<div class="commit sansserif">

+			<h2 class="date">03 September 2021</h2>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">fixes losing your additional language upon changing species</li>
+			</ul>
+
+			<h2 class="date">01 September 2021</h2>
+			<h3 class="author">BlueWildrose updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">The waddle component now takes size into account when running rotating animations, thus not reverting character sizes to default size.</li>
+			</ul>
+			<h3 class="author">ma44 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Weapon rechargers now have their recharger indicators again.</li>
+				<li class="bugfix">Energy guns now update when switching modes again.</li>
+				<li class="bugfix">Stabilized yellow slime extracts will now update cells and guns it recharges.</li>
+				<li class="rscadd">Weapon rechargers will now be more noticeable when it has finished recharging something.</li>
+			</ul>
+			<h3 class="author">zeroisthebiggay updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">the fucking chainsaw sprite</li>
+			</ul>
+
 			<h2 class="date">28 August 2021</h2>
 			<h3 class="author">DeltaFire15 updated:</h3>
 			<ul class="changes bgimages16">
@@ -430,35 +453,6 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">The axolotl ears in the .dmi file actually exist to the game now.</li>
 			</ul>
-
-			<h2 class="date">02 July 2021</h2>
-			<h3 class="author">silicons updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">spray bottles work again.</li>
-			</ul>
-
-			<h2 class="date">30 June 2021</h2>
-			<h3 class="author">WanderingFox95 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">More plushies in the code.</li>
-				<li class="imageadd">Nabbed some plushie sprites from Cit RP and TG and made some myself. Enjoy!</li>
-				<li class="rscadd">The Daily Whiplash (Newspaper Baton) is now available! (Using sticky tape to stick a newspaper onto a baton) Bap!</li>
-				<li class="imageadd">A rolled up newspaper sprite was provided.</li>
-				<li class="balance">Switched Gateway and Vault locations on Boxstation, bringing it more in line with other stations.</li>
-			</ul>
-			<h3 class="author">bunny232 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">The pubby xenobiology air/scrubber network is now isolated from the rest of the station</li>
-			</ul>
-			<h3 class="author">qweq12yt updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscdel">HoP's cargo access was removed...</li>
-			</ul>
-			<h3 class="author">shellspeed1 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">NT has lost experimental KA tech to miners who were lost in the field. Make sure to try and recover it.</li>
-				<li class="rscadd">Adds an extremely expensive survival pod to mining for people to work towards. Get to work cracking rocks today.</li>
-			</ul>
 		</div>

 <b>GoonStation 13 Development Team</b>
@@ -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
@@ -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."
@@ -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."
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes: 
-  - bugfix: "the fucking chainsaw sprite"
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - bugfix: "Might've fixed some ghost sprite oddities nobody even knew about"