Revert "Мержим наше"

mcbalaam · Dec 13, 2022 · 1bf3001 · 1bf3001
1 parent d16ef07
commit 1bf3001
Show file tree

Hide file tree

Showing 157 changed files with 938 additions and 1,157 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -7,7 +7,7 @@
       "name": "Launch DreamSeeker",
       "preLaunchTask": "Build All",
       "dmb": "${workspaceFolder}/${command:CurrentDMB}",
-	  "dreamDaemon": true
+	  "dreamDaemon": false
     }
   ]
 }
diff --git a/code/controllers/configuration/entries/movespeed.dm b/code/controllers/configuration/entries/movespeed.dm
@@ -94,7 +94,7 @@
 	config_entry_value = 24
 
 /datum/config_entry/number/movedelay/sprint_stamina_cost
-	config_entry_value = 5
+	config_entry_value = 1.4
 
 /datum/config_entry/number/movedelay/sprint_buffer_regen_per_ds
 	config_entry_value = 0.4

diff --git a/code/controllers/subsystem/nightshift.dm b/code/controllers/subsystem/nightshift.dm
@@ -46,9 +46,9 @@ SUBSYSTEM_DEF(nightshift)
 	nightshift_active = active
 	if(announce)
 		if (active)
-			announce("Добрый вечер, Экипаж Космической Станции. Чтобы снизить потребление энергии и стимулировать Биоритмы некоторых видов, все осветительные приборы на борту станции были приглушены на ночь.")
+			announce("Good evening, crew. To reduce power consumption and stimulate the circadian rhythms of some species, all of the lights aboard the station have been dimmed for the night.")
 		else
-			announce("Доброе утро, Экипаж Космической Станции. Поскольку сейчас дневное время, все осветительные приборы на борту станции были восстановлены до их прежней яркости.")
+			announce("Good morning, crew. As it is now day time, all of the lights aboard the station have been restored to their former brightness.")
 	var/max_level
 	var/configured_level = CONFIG_GET(number/night_shift_public_areas_only)
 	if(isnull(max_level_override))

diff --git a/code/controllers/subsystem/security_level.dm b/code/controllers/subsystem/security_level.dm
@@ -20,7 +20,7 @@ SUBSYSTEM_DEF(security_level)
 	if(new_level >= SEC_LEVEL_GREEN && new_level <= SEC_LEVEL_DELTA && new_level != GLOB.security_level)
 		switch(new_level)
 			if(SEC_LEVEL_GREEN)
-				minor_announce(CONFIG_GET(string/alert_green), "Внимание! Уровень Безопасности понижен до Зеленого:")
+				minor_announce(CONFIG_GET(string/alert_green), "Attention! Security level lowered to green:")
 				if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL)
 					if(GLOB.security_level >= SEC_LEVEL_RED)
 						SSshuttle.emergency.modTimer(4)
@@ -34,11 +34,11 @@ SUBSYSTEM_DEF(security_level)
 						FA.update_icon()
 			if(SEC_LEVEL_BLUE)
 				if(GLOB.security_level < SEC_LEVEL_BLUE)
-					minor_announce(CONFIG_GET(string/alert_blue_upto), "Внимание! Уровень Безопасности повышен до Синего:",1)
+					minor_announce(CONFIG_GET(string/alert_blue_upto), "Attention! Security level elevated to blue:",1)
 					if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL)
 						SSshuttle.emergency.modTimer(0.6)
 				else
-					minor_announce(CONFIG_GET(string/alert_blue_downto), "Внимание! Уровень Безопасности понижен до Синего:")
+					minor_announce(CONFIG_GET(string/alert_blue_downto), "Attention! Security level lowered to blue:")
 					if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL)
 						if(GLOB.security_level >= SEC_LEVEL_RED)
 							SSshuttle.emergency.modTimer(2.4)
@@ -51,14 +51,14 @@ SUBSYSTEM_DEF(security_level)
 						FA.update_icon()
 			if(SEC_LEVEL_AMBER)
 				if(GLOB.security_level < SEC_LEVEL_AMBER)
-					minor_announce(CONFIG_GET(string/alert_amber_upto), "Внимание! Уровень Безопасности повышен до Янтарного:",1)
+					minor_announce(CONFIG_GET(string/alert_amber_upto), "Attention! Security level elevated to amber:",1)
 					if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL)
 						if(GLOB.security_level == SEC_LEVEL_GREEN)
 							SSshuttle.emergency.modTimer(0.4)
 						else
 							SSshuttle.emergency.modTimer(0.66)
 				else
-					minor_announce(CONFIG_GET(string/alert_amber_downto), "Внимание! Уровень Безопасности понижен до Янтарного:")
+					minor_announce(CONFIG_GET(string/alert_amber_downto), "Attention! Security level lowered to amber:")
 					if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL)
 						SSshuttle.emergency.modTimer(1.6)
 				GLOB.security_level = SEC_LEVEL_AMBER
@@ -68,7 +68,7 @@ SUBSYSTEM_DEF(security_level)
 						FA.update_icon()
 			if(SEC_LEVEL_RED)
 				if(GLOB.security_level < SEC_LEVEL_RED)
-					minor_announce(CONFIG_GET(string/alert_red_upto), "Внимание! Код Красный!",1)
+					minor_announce(CONFIG_GET(string/alert_red_upto), "Attention! Code red!",1)
 					if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL)
 						if(GLOB.security_level == SEC_LEVEL_GREEN)
 							SSshuttle.emergency.modTimer(0.25)
@@ -77,7 +77,7 @@ SUBSYSTEM_DEF(security_level)
 						else
 							SSshuttle.emergency.modTimer(0.625)
 				else
-					minor_announce(CONFIG_GET(string/alert_red_downto), "Внимание! Код Красный!")
+					minor_announce(CONFIG_GET(string/alert_red_downto), "Attention! Code red!")
 				GLOB.security_level = SEC_LEVEL_RED
 				sound_to_playing_players('sound/misc/voyalert.ogg', volume = 50) // Citadel change - Makes alerts play a sound
 
@@ -87,7 +87,7 @@ SUBSYSTEM_DEF(security_level)
 				for(var/obj/machinery/computer/shuttle/pod/pod in GLOB.machines)
 					pod.admin_controlled = FALSE
 			if(SEC_LEVEL_DELTA)
-				minor_announce(CONFIG_GET(string/alert_delta), "Внимание! Уровень Безопасности достигнут Дельта-Кода!",1)
+				minor_announce(CONFIG_GET(string/alert_delta), "Attention! Delta security level reached!",1)
 				if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL)
 					if(GLOB.security_level < SEC_LEVEL_BLUE)
 						SSshuttle.emergency.modTimer(0.25)

diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
@@ -339,7 +339,6 @@ SUBSYSTEM_DEF(vote)
 				GLOB.master_mode = "dynamic"
 				if(. == "extended")
 					GLOB.dynamic_extended = TRUE
-					GLOB.master_mode = "extended"
 				message_admins("The gamemode has been voted for, and has been changed to: [GLOB.master_mode]")
 				log_admin("Gamemode has been voted for and switched to: [GLOB.master_mode].")
 			if("restart")