Первая часть готова.

.github/workflows/label_merge_conflicts.yml

@@ -1,15 +1,15 @@
-name: 'Merge Conflict Detection'
-on:
-  push:
-    branches:
-      - main
-jobs:
-  triage:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mschilde/auto-label-merge-conflicts@master
-        with:
-          CONFLICT_LABEL_NAME: "has conflicts"
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          MAX_RETRIES: 5
-          WAIT_MS: 5000
+# name: 'Merge Conflict Detection'
+# on:
+#   push:
+#     branches:
+#       - main
+# jobs:
+#   triage:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: mschilde/auto-label-merge-conflicts@master
+#         with:
+#           CONFLICT_LABEL_NAME: "has conflicts"
+#           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#           MAX_RETRIES: 5
+#           WAIT_MS: 5000

code/datums/ai/behaviours/run_from_target.dm

@@ -36,24 +36,27 @@
 	if(!target)
 		return FALSE
 
-	plot_path_away_from(controller, target)
-	return ..()
+	// Only return TRUE if we successfully plotted a path
+	return plot_path_away_from(controller, target) && ..()
 
 /datum/ai_behavior/run_away_from_target/perform(delta_time, datum/ai_controller/controller, target_key, hiding_location_key)
 	. = ..()
 	var/atom/target = controller.blackboard[hiding_location_key] || controller.blackboard[target_key]
-	var/escaped =  !target || !can_see(controller.pawn, target, run_distance) // If we can't see it we got away
-	if (!controller.blackboard[BB_BASIC_MOB_FLEEING])
+	var/escaped = !target || !can_see(controller.pawn, target, run_distance) // If we can't see it we got away
+
+	if(!controller.blackboard[BB_BASIC_MOB_FLEEING] || escaped)
 		finish_action(controller, succeeded = TRUE)
 		return
-	if (escaped)
-		finish_action(controller, succeeded = TRUE)
+
+	// If we can't find a valid path, finish the action as failed
+	if(!controller.current_movement_target || !plot_path_away_from(controller, target))
+		finish_action(controller, succeeded = FALSE)
 		return
-	if (!in_range(controller.pawn, controller.current_movement_target))
+
+	if(!in_range(controller.pawn, controller.current_movement_target))
 		if(until_destination)
 			finish_action(controller, TRUE)
 		return
-	plot_path_away_from(controller, target)
 
 /datum/ai_behavior/run_away_from_target/proc/plot_path_away_from(datum/ai_controller/controller, atom/target)
 	var/turf/target_destination = get_turf(controller.pawn)

code/modules/client/preferences.dm

@@ -271,7 +271,7 @@ GLOBAL_LIST_INIT(name_adjustments, list())
 				used_title = "Character Sheet"
 
 			// Top-level menu table
-			dat += "<table style='width: 100%; line-height: 20px;'>"
+			dat += "<table style='width: 100%; line-height: 18px;'>"
 			// NEXT ROW
 			dat += "<tr>"
 			dat += "<td style='width:33%;text-align:left'>"
@@ -449,6 +449,15 @@ GLOBAL_LIST_INIT(name_adjustments, list())
 					dat += "<a href='?_src_=prefs;preference=view_headshot;task=input'>Показать</a>"
 				else
 					dat += "<a href='?_src_=prefs;preference=view_headshot;task=input'>View</a>"
+			if(user.client.prefs.be_russian)
+				dat += "<br><b>Nudeshot(3:4):</b> <a href='?_src_=prefs;preference=nudeshot;task=input'>Изменить</a>"
+			else
+				dat += "<br><b>Nudeshot(3:4):</b> <a href='?_src_=prefs;preference=nudeshot;task=input'>Change</a>"
+			if(nudeshot_link != null)
+				if(user.client.prefs.be_russian)
+					dat += "<a href='?_src_=prefs;preference=view_nudeshot;task=input'>Показать</a>"
+				else
+					dat += "<a href='?_src_=prefs;preference=view_nudeshot;task=input'>View</a>"
 
 /*
 			dat += "<br><br><b>Special Names:</b><BR>"
@@ -546,15 +555,6 @@ GLOBAL_LIST_INIT(name_adjustments, list())
 				dat += "<br><b>Дополнительное Описание:</b> <a href='?_src_=prefs;preference=descriptors;task=menu'>Изменить</a>"
 			else
 				dat += "<br><b>Descriptors:</b> <a href='?_src_=prefs;preference=descriptors;task=menu'>Change</a>"
-			if(user.client.prefs.be_russian)
-				dat += "<br><b>Nudeshot(3:4):</b> <a href='?_src_=prefs;preference=nudeshot;task=input'>Изменить</a>"
-			else
-				dat += "<br><b>Nudeshot(3:4):</b> <a href='?_src_=prefs;preference=nudeshot;task=input'>Change</a>"
-			if(nudeshot_link != null)
-				if(user.client.prefs.be_russian)
-					dat += "<a href='?_src_=prefs;preference=view_nudeshot;task=input'>Показать</a>"
-				else
-					dat += "<a href='?_src_=prefs;preference=view_nudeshot;task=input'>View</a>"
 			dat += "</td>"
 
 			dat += "</tr></table>"
@@ -851,19 +851,13 @@ GLOBAL_LIST_INIT(name_adjustments, list())
 	dat += "<td width='33%' align='right'>"
 	if(user.client.prefs.be_russian)
 		dat += "<b>Русскоязычность:</b> <a href='?_src_=prefs;preference=be_russian'>[(be_russian) ? "Yes":"No"]</a><br>"
-	else
-		dat += "<b>Be Russian:</b> <a href='?_src_=prefs;preference=be_russian'>[(be_russian) ? "Yes":"No"]</a><br>"
-	if(user.client.prefs.be_russian)
 		dat += "<b>Нон-Кон:</b> <a href='?_src_=prefs;preference=be_defiant'>[(defiant) ? "Yes":"No"]</a><br>"
-	else
-		dat += "<b>Be defiant:</b> <a href='?_src_=prefs;preference=be_defiant'>[(defiant) ? "Yes":"No"]</a><br>"
-	if(user.client.prefs.be_russian)
 		dat += "<b>Девственность:</b> <a href='?_src_=prefs;preference=be_virgin'>[(virginity) ? "Yes":"No"]</a><br>"
-	else
-		dat += "<b>Be a virgin:</b> <a href='?_src_=prefs;preference=be_virgin'>[(virginity) ? "Yes":"No"]</a><br>"
-	if(user.client.prefs.be_russian)
 		dat += "<b>Быть Голосом:</b> <a href='?_src_=prefs;preference=schizo_voice'>[(toggles & SCHIZO_VOICE) ? "Enabled":"Disabled"]</a>"
 	else
+		dat += "<b>Be Russian:</b> <a href='?_src_=prefs;preference=be_russian'>[(be_russian) ? "Yes":"No"]</a><br>"
+		dat += "<b>Be defiant:</b> <a href='?_src_=prefs;preference=be_defiant'>[(defiant) ? "Yes":"No"]</a><br>"
+		dat += "<b>Be a virgin:</b> <a href='?_src_=prefs;preference=be_virgin'>[(virginity) ? "Yes":"No"]</a><br>"
 		dat += "<b>Be voice:</b> <a href='?_src_=prefs;preference=schizo_voice'>[(toggles & SCHIZO_VOICE) ? "Enabled":"Disabled"]</a>"
 	dat += "</td>"
 	dat += "</tr>"

code/modules/mob/living/carbon/rogfatstam.dm

@@ -30,7 +30,7 @@
 /mob/living/rogstam_add(added as num)
 	if(HAS_TRAIT(src, TRAIT_NOROGSTAM))
 		return TRUE
-	if(m_intent == MOVE_INTENT_RUN)
+	if(mind && m_intent == MOVE_INTENT_RUN)
 		mind.add_sleep_experience(/datum/skill/misc/athletics, (STAINT*0.02))
 	rogstam += added
 	if(rogstam > maxrogstam)

code/modules/mob/living/say.dm

@@ -353,16 +353,14 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 		for(var/mob/M in listening)
 			if(!M.client)
 				continue
-			// if(!(M.client.prefs.toggles & SOUND_BARK))
-			// 	listening -= M
-		var/barks = min(round((LAZYLEN(message) / vocal_speed)) + 1, BARK_MAX_BARKS)
+		var/barks = min(round((LAZYLEN(message) / max(vocal_speed, 1))) + 1, BARK_MAX_BARKS)
 		var/total_delay
 		vocal_current_bark = world.time
 		for(var/i in 1 to barks)
 			if(total_delay > BARK_MAX_TIME)
 				break
 			addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, bark), listening, (message_range * (is_yell ? 4 : 1)), (vocal_volume * (is_yell ? 1.5 : 1)), BARK_DO_VARY(vocal_pitch, vocal_pitch_range), vocal_current_bark), total_delay)
-			total_delay += rand(DS2TICKS(vocal_speed / BARK_SPEED_BASELINE), DS2TICKS(vocal_speed / BARK_SPEED_BASELINE) + DS2TICKS((vocal_speed / BARK_SPEED_BASELINE) * (is_yell ? 0.5 : 1))) TICKS
+			total_delay += rand(DS2TICKS(max(vocal_speed, 1) / BARK_SPEED_BASELINE), DS2TICKS(max(vocal_speed, 1) / BARK_SPEED_BASELINE) + DS2TICKS((max(vocal_speed, 1) / BARK_SPEED_BASELINE) * (is_yell ? 0.5 : 1))) TICKS
 
 /mob/proc/binarycheck()
 	return FALSE

modular_bluewood/modules/mob/living/carbon/human/species_types/roguetown/anthromorphsmall.dm

@@ -1,6 +1,6 @@
 /datum/species/anthromorphsmall
-	ru_name = "Верминфольк (Скавены)" 
-	ru_desc = "<b>Верминфольк (Скавены)</b><br>\
+	ru_name = "Верминфольк" 
+	ru_desc = "<b>Верминфольк</b><br>\
 			Раса, родственная диким сородичам, но отмеченная заметно меньшим ростом. \
 			Их уважают несколько меньше из-за сходства с грызунами - подобно тому, \
 			как кобольды отличаются от сиссеан."

modular_bluewood/modules/mob/living/carbon/human/species_types/roguetown/humen.dm

@@ -1,5 +1,5 @@
 /datum/species/human/northern
-	ru_name = "Человек (Северяк)"
+	ru_name = "Человек"
 	ru_desc = "<b>Человек</b><br>\
 	Люди являются самыми древними созданиями старого бога. Отличаются своей упорностью и преобладающим населением, люди, как правило, \
 	превосходят другие расы по численности в соотношении примерно десяти к одному в таких регионах, как Гренцельхоф.\

modular_bluewood/modules/mob/living/carbon/human/species_types/roguetown/moth.dm

@@ -1,4 +1,4 @@
 /datum/species/moth
-	ru_name = "Флювиан (Моль)"
+	ru_name = "Флювиан"
 	ru_desc = "<b>Флювиан</b><br>\
 	Флювианы - это раса, которая выросла из мутации, которая произошла в результате неудачной работы над Искуственным Солнцем магами небезызвестного Королевства Рокхиль."

modular_bluewood/modules/mob/living/carbon/human/species_types/roguetown/vulpkanin.dm

@@ -1,5 +1,5 @@
 /datum/species/vulpkanin
-	ru_name = "Вульпканины (Волкоподобные)"
-	ru_desc = "<b>Вульпканины (Волкоподобные)</b><br>\
+	ru_name = "Вульпканины"
+	ru_desc = "<b>Вульпканины</b><br>\
 	История этой расы была утеряна тысячи лет назад, однако некоторые лица утверждают \
 	о вечно появляющейся в истории белоснежной волчице... которая точно может дать ответы на некоторые вопросы."