Merge branch 'master' of github.com:TauCetiStation/TauCetiClassic int…

…o samosbor

code/__DEFINES/misc.dm

@@ -233,6 +233,7 @@
 
 #define BYOND_JOIN_LINK "byond://[BYOND_SERVER_ADDRESS]"
 #define BYOND_SERVER_ADDRESS config.server ? "[config.server]" : "[world.address]:[world.port]"
+#define BRIDGE_JOIN_LINKS "Присоединиться: [BYOND_JOIN_LINK]"
 
 #define DELAY2GLIDESIZE(delay) (world.icon_size / max(CEIL(delay / world.tick_lag), 1))
 

code/controllers/subsystem/events.dm

@@ -385,8 +385,8 @@ SUBSYSTEM_DEF(events)
 	if(config.chat_bridge && custom_event_msg)
 		world.send2bridge(
 			type = list(BRIDGE_ANNOUNCE),
-			attachment_title = "Custom Event",
-			attachment_msg = custom_event_msg + "\nJoin now: <[BYOND_JOIN_LINK]>",
+			attachment_title = "Ивент от администрации",
+			attachment_msg = "[custom_event_msg]\n[BRIDGE_JOIN_LINKS]",
 			attachment_color = BRIDGE_COLOR_ANNOUNCE,
 			mention = BRIDGE_MENTION_EVENT,
 		)

code/controllers/subsystem/shuttles.dm

@@ -191,8 +191,8 @@ SUBSYSTEM_DEF(shuttle)
 
 				world.send2bridge(
 					type = list(BRIDGE_ROUNDSTAT),
-					attachment_title = "The shuttle docked to the station",
-					attachment_msg = "Join now: <[BYOND_JOIN_LINK]>",
+					attachment_title = "Шаттл пристыковался к станции",
+					attachment_msg = BRIDGE_JOIN_LINKS,
 					attachment_color = BRIDGE_COLOR_ROUNDSTAT,
 				)
 

code/controllers/subsystem/ticker.dm

@@ -294,7 +294,7 @@ SUBSYSTEM_DEF(ticker)
 	world.send2bridge(
 		type = list(BRIDGE_ROUNDSTAT),
 		attachment_title = "Раунд начался, игровой режим - **[master_mode]**",
-		attachment_msg = "Раунд #[global.round_id]; Присоединиться сейчас: <[BYOND_JOIN_LINK]>",
+		attachment_msg = "Раунд #[global.round_id]; [BRIDGE_JOIN_LINKS]",
 		attachment_color = BRIDGE_COLOR_ANNOUNCE,
 	)
 

code/game/gamemodes/objectives/traders_objectives.dm

@@ -42,7 +42,7 @@
 		"факс" = /obj/machinery/faxmachine,
 		"ядерную боеголовку" = /obj/machinery/nuclearbomb,
 		"раздатчик атмосферных труб" = /obj/machinery/pipedispenser,
-		"кошку главврача Дасти" = /mob/living/simple_animal/cat/dusty,
+		"кота главврача Дасти" = /mob/living/simple_animal/cat/dusty,
 		"плазменный дробовик" = /obj/item/weapon/gun/plasma/p104sass,
 		"ручной телепортер" = /obj/item/weapon/hand_tele,
 		"тыквяк" = /obj/item/weapon/reagent_containers/food/snacks/grown/gourd,

code/game/world.dm

@@ -56,8 +56,8 @@ var/global/it_is_a_snow_day = FALSE
 
 	world.send2bridge(
 		type = list(BRIDGE_ROUNDSTAT),
-		attachment_title = "Server starting up, new round will start soon",
-		attachment_msg = "Join now: <[BYOND_JOIN_LINK]>",
+		attachment_title = "Сервер запущен, скоро начнется новый раунд",
+		attachment_msg = BRIDGE_JOIN_LINKS,
 		attachment_color = BRIDGE_COLOR_ANNOUNCE,
 		mention = BRIDGE_MENTION_ROUNDSTART,
 	)

code/modules/admin/admin.dm

@@ -774,15 +774,15 @@ var/global/BSACooldown = 0
 			log_admin("[key_name(usr)] delayed the round start.")
 			world.send2bridge(
 				type = list(BRIDGE_ROUNDSTAT),
-				attachment_msg = "**[key_name(usr)]** delayed the round start",
+				attachment_msg = "**[key_name(usr)]** приостановил начало раунда",
 				attachment_color = BRIDGE_COLOR_ROUNDSTAT,
 			)
 		else
 			to_chat(world, "<b>The game will start in [newtime] seconds.</b>")
 			log_admin("[key_name(usr)] set the pre-game delay to [newtime] seconds.")
 			world.send2bridge(
 				type = list(BRIDGE_ROUNDSTAT),
-				attachment_msg = "**[key_name(usr)]** set the pre-game delay to [newtime] seconds.",
+				attachment_msg = "**[key_name(usr)]** установил задержку перед началом раунда на [PLUR_SECONDS_IN(newtime)].",
 				attachment_color = BRIDGE_COLOR_ROUNDSTAT,
 			)
 		feedback_add_details("admin_verb","DELAY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -799,7 +799,7 @@ var/global/BSACooldown = 0
 		message_admins("<span class='adminnotice'>[key_name(usr)] [SSticker.admin_delayed ? "delayed the round end" : "has made the round end normally"].</span>")
 		world.send2bridge(
 			type = list(BRIDGE_ROUNDSTAT),
-			attachment_msg = "**[key_name(usr)]** [SSticker.admin_delayed ? "delayed the round end" : "has made the round end normally"].",
+			attachment_msg = "[SSticker.admin_delayed ? "**[key_name(usr)]** приостановил конец раунда" : "Теперь раунд закончится нормально"].",
 			attachment_color = BRIDGE_COLOR_ROUNDSTAT,
 		)
 	else

code/modules/admin/topic.dm

@@ -322,7 +322,7 @@
 		message_admins("[key_name(usr)] [SSticker.admin_delayed ? "delayed the round end" : "has made the round end normally"].")
 		world.send2bridge(
 			type = list(BRIDGE_ROUNDSTAT),
-			attachment_msg = "**[key_name(usr)]** [SSticker.admin_delayed ? "delayed the round end" : "has made the round end normally"].",
+			attachment_msg = "[SSticker.admin_delayed ? "**[key_name(usr)]** приостановил конец раунда" : "Теперь раунд закончится нормально"].",
 			attachment_color = BRIDGE_COLOR_ROUNDSTAT,
 		)
 

code/modules/clothing/neck/ties.dm

@@ -46,7 +46,7 @@
 	ADD_TRAIT(user, TRAIT_AIRBAG_PROTECTION, GENERIC_TRAIT)
 	to_chat(user, "<span class='warning'>Your [src] deploys!</span>")
 	playsound(src, 'sound/effects/inflate.ogg', VOL_EFFECTS_MASTER)
-	addtimer(CALLBACK(src, PROC_REF(delete)), 5 SECOND)
+	addtimer(CALLBACK(src, PROC_REF(delete), user), 5 SECOND)
 
 /obj/item/clothing/neck/airbag/proc/delete(mob/user)
 	for(var/atom/movable/AM in contents)

code/modules/mob/living/silicon/robot/life.dm

@@ -232,7 +232,7 @@
 
 /mob/living/silicon/robot/update_canmove()
 	anchored = HAS_TRAIT(src, TRAIT_ANCHORED)
-	canmove = !(buckled || anchored || weakened || HAS_TRAIT(src, TRAIT_IMMOBILIZED))
+	canmove = !(buckled || anchored || weakened || lockcharge || HAS_TRAIT(src, TRAIT_IMMOBILIZED))
 
 //Robots on fire
 /mob/living/silicon/robot/handle_fire()