Merge branch 'master' into CLOfficeUpdate

cmss13-devs · Aug 7, 2023 · 9d91e5f · 9d91e5f
2 parents 04b2f0d + c141a46
commit 9d91e5f
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 42 deletions.
diff --git a/code/game/area/strata.dm b/code/game/area/strata.dm
@@ -50,6 +50,10 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
 	temperature = T20C //Nice and room temp
 	ceiling = CEILING_METAL
 
+/area/strata/ag/interior/mountain
+	name = "Outside mountain"
+	icon_state = "ag_e"
+
 /area/strata/ag/interior/restricted
 	is_resin_allowed = FALSE
 	flags_area = AREA_NOTUNNEL

diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm
@@ -1,7 +1,7 @@
 /datum/equipment_preset/synth
 	name = "Synth"
 	uses_special_name = TRUE
-	languages = ALL_SYNTH_LANGUAGES_UPP
+	languages = ALL_SYNTH_LANGUAGES
 	skills = /datum/skills/synthetic
 	paygrade = "SYN"
 
@@ -458,6 +458,7 @@
 /datum/equipment_preset/synth/survivor/upp
 	name = "Survivor - Synthetic - UPP Synth"
 	flags = EQUIPMENT_PRESET_EXTRA
+	languages = ALL_SYNTH_LANGUAGES_UPP
 	assignment = JOB_UPP_COMBAT_SYNTH
 	rank = JOB_SURVIVOR
 	faction = FACTION_UPP

diff --git a/html/changelogs/AutoChangeLog-pr-4115.yml b/html/changelogs/AutoChangeLog-pr-4115.yml
@@ -0,0 +1,4 @@
+author: "Segrain"
+delete-after: True
+changes:
+  - bugfix: "Non-UPP synthetics no longer default to speaking Russian."
diff --git a/html/changelogs/archive/2023-08.yml b/html/changelogs/archive/2023-08.yml
@@ -93,3 +93,6 @@
       verb)
   Steelpoint:
   - bugfix: EMT/White-Green armband now has a sprite
+2023-08-07:
+  Huffie56:
+  - maptweak: changing an area so it stop snowing inside walls.