Merge branch 'TauCetiStation:master' into master

.github/COMPONENTOWNERS.yml

@@ -23,10 +23,10 @@ components:
 
   ## Иконки ##
   icons/:
-    /sprites-department
+    TauCetiStation/sprites-department
 
   ## Карты ##
-  maps/boxstation/: /maps-department
+  maps/boxstation/: TauCetiStation/maps-department
   #maps/delta/: Deahaka
   #maps/falcon/: Tap0r
   #maps/gamma/: AgRevol
@@ -41,7 +41,7 @@ components:
   "*.py": volas
   "*.sh": volas
 
-  .github/: /maintainers
+  .github/: TauCetiStation/maintainers
 
 ignored-authors:
   - dependabot

code/__HELPERS/unsorted.dm

@@ -685,7 +685,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
 
 // Takes: Area type as text string or as typepath OR an instance of the area.
 // Returns: A list of all turfs in areas of that type of that type in the world.
-// Please note that because of (loop in area) this is not really optimal, 
+// Please note that because of (loop in area) this is not really optimal,
 // but you probably have no choice
 /proc/get_area_turfs(areatype, subtypes=TRUE, filter_by_z = 0, ignore_blocked = FALSE)
 	if(istext(areatype))
@@ -1645,12 +1645,12 @@ var/global/list/WALLITEMS = typecacheof(list(
 // Format a power value in W, kW, MW, or GW
 /proc/DisplayPower(powerused)
 	if(powerused < 1000) // Less than a kW
-		return "[powerused] W"
+		return "[powerused] Вт"
 	if(powerused < 1000000) // Less than a MW
-		return "[round((powerused * 0.001), 0.01)] kW"
+		return "[round((powerused * 0.001), 0.01)] кВт"
 	if(powerused < 1000000000) // Less than a GW
-		return "[round((powerused * 0.000001), 0.001)] MW"
-	return "[round((powerused * 0.000000001), 0.0001)] GW"
+		return "[round((powerused * 0.000001), 0.001)] МВт"
+	return "[round((powerused * 0.000000001), 0.0001)] ГВТ"
 
 //Returns a list of all locations (except the area) the movable is within.
 /proc/get_nested_locs(atom/movable/AM, include_turf = FALSE)

code/_onclick/hud/rendering/planes/lighting_planes.dm

@@ -30,6 +30,7 @@
 		return
 
 	if(!assigned_map)
+		update_alpha(value = client.mob.lighting_alpha)
 		RegisterSignal(client.mob, COMSIG_MOB_LIGHTING_ALPHA_CHANGED, PROC_REF(update_alpha), override = TRUE)
 
 	// about backdrops and why we need it https://www.byond.com/forum/?post=2141928

code/datums/components/aura_healing.dm

@@ -140,7 +140,7 @@
 		current_alerts -= remove_alert_from
 
 /atom/movable/screen/alert/aura_healing
-	name = "Aura Healing"
+	name = "Целительная аура"
 	icon_state = "template"
 
 #undef HEAL_EFFECT_COOLDOWN

code/datums/emotes/robot/audible.dm

@@ -62,6 +62,8 @@
 
 
 /datum/emote/robot/law
+	key = "law"
+
 	message_1p = "You show your legal authorization barcode."
 	message_3p = "shows it's legal authorization barcode."
 
@@ -80,22 +82,142 @@
 		EMOTE_STATE(has_robot_module, /obj/item/weapon/robot_module/security),
 	)
 
+/datum/emote/robot/confirm
+	key = "confirm"
 
-/datum/emote/robot/halt
-	message_1p = "You skreech with your speakers, \"Halt! Security!\""
-	message_3p = "skreeches with it's skeapers, \"Halt! Security!\""
+	message_1p = "You emits affirmative blip."
+	message_3p = "emits an affirmative blip."
 
-	message_impaired_production = "makes a loud noise."
-	message_impaired_reception = "flickers with red."
+	message_impaired_production = "makes a noise."
+	message_impaired_reception = "flickers."
 
-	message_miming = "makes loud robot noises."
-	message_muzzled = "makes a loud noise."
+	message_miming = "makes robot noises."
+	message_muzzled = "makes a weak noise."
 
 	message_type = SHOWMSG_AUDIO
 
-	sound = 'sound/voice/halt.ogg'
+	sound = 'sound/machines/synth_yes.ogg'
+
+	state_checks = list(
+		EMOTE_STATE(is_stat, CONSCIOUS),
+	)
+
+/datum/emote/robot/deny
+	key = "deny"
+
+	message_1p = "You emits negative blip."
+	message_3p = "emits a negative blip."
+
+	message_impaired_production = "makes a noise."
+	message_impaired_reception = "flickers."
+
+	message_miming = "makes robot noises."
+	message_muzzled = "makes a weak noise."
+
+	message_type = SHOWMSG_AUDIO
+
+	sound = 'sound/machines/synth_no.ogg'
+
+	state_checks = list(
+		EMOTE_STATE(is_stat, CONSCIOUS),
+	)
+
+/datum/emote/robot/scary
+	key = "scary"
+
+	message_1p = "You emits disconcerting tone."
+	message_3p = "emits a disconcerting tone."
+
+	message_impaired_production = "makes a noise."
+	message_impaired_reception = "flickers."
+
+	message_miming = "makes robot noises."
+	message_muzzled = "makes a weak noise."
+
+	message_type = SHOWMSG_AUDIO
+
+	sound = 'sound/machines/synth_alert.ogg'
+
+	state_checks = list(
+		EMOTE_STATE(is_stat, CONSCIOUS),
+	)
+
+/datum/emote/robot/woop
+	key = "woop"
+
+	message_1p = "You chirp happily."
+	message_3p = "chirps happily."
+
+	message_impaired_production = "makes a weak noise."
+	message_impaired_reception = "flickers."
+
+	message_miming = "makes robot noises."
+	message_muzzled = "makes a weak noise."
+
+	message_type = SHOWMSG_AUDIO
+
+	sound = 'sound/machines/dwoop.ogg'
+
+	state_checks = list(
+		EMOTE_STATE(is_stat, CONSCIOUS),
+	)
+
+/datum/emote/robot/boop
+	key = "boop"
+
+	message_1p = "You boop."
+	message_3p = "boops."
+
+	message_impaired_production = "makes a weak noise."
+	message_impaired_reception = "flickers."
+
+	message_miming = "makes robot noises."
+	message_muzzled = "makes a weak noise."
+
+	message_type = SHOWMSG_AUDIO
+
+	sound = 'sound/machines/roboboop.ogg'
+
+	state_checks = list(
+		EMOTE_STATE(is_stat, CONSCIOUS),
+	)
+
+/datum/emote/robot/robochirp
+	key = "chirp"
+
+	message_1p = "You chirp."
+	message_3p = "chirps."
+
+	message_impaired_production = "makes a weak noise."
+	message_impaired_reception = "flickers."
+
+	message_miming = "makes robot noises."
+	message_muzzled = "makes a weak noise."
+
+	message_type = SHOWMSG_AUDIO
+
+	sound = 'sound/machines/robochirp.ogg'
+
+	state_checks = list(
+		EMOTE_STATE(is_stat, CONSCIOUS),
+	)
+
+/datum/emote/robot/calling
+	key = "call"
+
+	message_1p = "You're dialing."
+	message_3p = "dialling."
+
+	message_impaired_production = "makes a weak noise."
+	message_impaired_reception = "flickers."
+
+	message_miming = "makes robot noises."
+	message_muzzled = "makes a weak noise."
+
+	message_type = SHOWMSG_AUDIO
+
+	sound = 'sound/machines/longwhistle_robot.ogg'
 
 	state_checks = list(
 		EMOTE_STATE(is_stat, CONSCIOUS),
-		EMOTE_STATE(has_robot_module, /obj/item/weapon/robot_module/security),
 	)

code/datums/status_effects/buffs.dm

@@ -1,6 +1,6 @@
 /atom/movable/screen/alert/status_effect/swarm_gift
-	name = "Swarm's Gift"
-	desc = "The Swarm gifts you with increased efficency, as well as muffled disintegration noises. Prosper and multiply!"
+	name = "Подарок роя"
+	desc = "Рой дарит вам повышенную эффективность, а также приглушенные звуки переработки. Процветайте и размножайтесь!"
 	icon_state = "swarm_gift"
 
 /atom/movable/screen/alert/status_effect/swarm_gift/Click()

code/datums/status_effects/debuffs.dm

@@ -126,8 +126,8 @@
 	owner.drop_from_inventory(owner.r_hand)
 
 /atom/movable/screen/alert/status_effect/asleep
-	name = "Asleep"
-	desc = "You've fallen asleep. Wait a bit and you should wake up. Unless you don't, considering how helpless you are."
+	name = "Сон"
+	desc = "Вы заснули. Подождите немного, и вы проснетесь, если только у вас всё в порядке..."
 	icon_state = "asleep"
 
 //STASIS
@@ -173,8 +173,8 @@
 	return ..()
 
 /atom/movable/screen/alert/status_effect/stasis_bag
-	name = "Stasis Bag"
-	desc = "Your biological functions have halted. You could live forever this way, but it's pretty boring."
+	name = "Стазисный мешок"
+	desc = "Ваши биологические функции остановились. Вы могли бы жить так вечно, но это довольно скучно."
 	icon_state = "stasis"
 
 /datum/status_effect/remove_trait

code/datums/status_effects/neutral.dm

@@ -1,6 +1,6 @@
 /atom/movable/screen/alert/status_effect/array_turn_back
-	name = "Turn Back"
-	desc = "Affect the replicator you were controlling before this one."
+	name = "Возвращение"
+	desc = "Воздействуйте на оболочку, которой управляли до этого."
 	icon_state = "swarm_turn_back"
 
 	var/mob/living/simple_animal/hostile/replicator/remembered

code/datums/status_effects/status_effect.dm

@@ -88,8 +88,8 @@ var/global/list/spawnable_status_effects = list(
 ////////////////
 
 /atom/movable/screen/alert/status_effect
-	name = "Curse of Mundanity"
-	desc = "You don't feel any different..."
+	name = "Проклятие обыденности"
+	desc = "Вы не чувствуете никакой разницы..."
 	var/datum/status_effect/attached_effect
 
 /atom/movable/screen/alert/status_effect/Destroy()

code/datums/wires/apc.dm

@@ -10,9 +10,9 @@ var/global/const/APC_WIRE_AI_CONTROL  = 8
 /datum/wires/apc/get_status()
 	var/obj/machinery/power/apc/A = holder
 	. += ..()
-	. += "[(A.locked ? "The APC is locked." : "The APC is unlocked.")]"
-	. += "[(A.shorted ? "The APCs power has been shorted." : "The APC is working properly!")]"
-	. += "[(A.aidisabled ? "The 'AI control allowed' light is off." : "The 'AI control allowed' light is on.")]"
+	. += "[(A.locked ? "Электрический щит заблокирован." : "Электрический щит разблокирован.")]"
+	. += "[(A.shorted ? "Электрический щит закоротило." : "Электрический щит работает нормально.")]"
+	. += "[(A.aidisabled ? "Индикатор удалённого доступа не горит." : "Индикатор удалённого доступа горит.")]"
 
 /datum/wires/apc/can_use()
 	var/obj/machinery/power/apc/A = holder

code/game/area/station_areas.dm

@@ -195,6 +195,7 @@ ADD_TO_GLOBAL_LIST(/area/station, the_station_areas)
 	icon_state = "SolarcontrolA"
 
 //Hallway
+
 /area/station/hallway
 	sound_environment = SOUND_AREA_STATION_HALLWAY
 
@@ -235,7 +236,7 @@ ADD_TO_GLOBAL_LIST(/area/station, the_station_areas)
 
 /area/station/hallway/secondary/entry
 	name = "Entry Shuttles Hallway"
-	cases = list("станцинженерного отделанные доки", "станцинженерного отделанных доков", "станцинженерного отделанным докам", "станцинженерного отделанные доки", "станцинженерного отделанными доками", "станцинженерного отделанных доках")
+	cases = list("коридор доков", "коридора доков", "коридору доков", "коридор доков", "коридором доков", "коридоре доков")
 	icon_state = "entry"
 
 /area/station/hallway/secondary/mine_sci_shuttle
@@ -285,7 +286,7 @@ ADD_TO_GLOBAL_LIST(/area/station, the_station_areas)
 
 /area/station/bridge/comms
 	name = "Communications Relay"
-	cases = list("коммуникацинженерного отделанное реле", "коммуникацинженерного отделанного реле", "коммуникацинженерного отделанному реле", "коммуникацинженерного отделанное реле", "коммуникацинженерного отделанным реле", "коммуникацинженерного отделанной реле")
+	cases = list("коммуникационное отделанное реле", "коммуникационного отделанного реле", "коммуникационному отделанному реле", "коммуникационное отделанное реле", "коммуникационным отделанным реле", "коммуникационном отделанном реле")
 	icon_state = "tcomsatcham"
 	sound_environment = SOUND_AREA_SMALL_METALLIC
 
@@ -400,7 +401,7 @@ ADD_TO_GLOBAL_LIST(/area/station, the_station_areas)
 
 /area/station/civilian/library
 	name = "Library"
-	cases = list("библинженерного отделатека", "библинженерного отделатеки", "библинженерного отделатеке", "библинженерного отделатека", "библинженерного отделатекой", "библинженерного отделатеке")
+	cases = list("библиотека", "библиотеки", "библиотеке", "библиотека", "библиотекой", "библиотеке")
 	icon_state = "library"
 
 /area/station/civilian/chapel
@@ -597,13 +598,13 @@ ADD_TO_GLOBAL_LIST(/area/station, the_station_areas)
 
 /area/station/medical/surgery
 	name = "Operating Theatre 1"
-	cases = list("операцинженерного отделанная №1", "операцинженерного отделанной №1", "операцинженерного отделанной №1", "операцинженерного отделанная №1", "операцинженерного отделанной №1", "операцинженерного отделанной №1")
+	cases = list("операционная №1", "операционной №1", "операционной №1", "операционная №1", "операционной №1", "операционной №1")
 	icon_state = "surgery"
 	ambience = list('sound/ambience/surgery_1.ogg', 'sound/ambience/surgery_2.ogg')
 
 /area/station/medical/surgery2
 	name = "Operating Theatre 2"
-	cases = list("операцинженерного отделанная №2", "операцинженерного отделанной №2", "операцинженерного отделанной №2", "операцинженерного отделанная №2", "операцинженерного отделанной №2", "операцинженерного отделанной №2")
+	cases = list("операционная №2", "операционной №2", "операционной №2", "операционная №2", "операционной №2", "операционной №2")
 	icon_state = "surgery"
 
 /area/station/medical/surgeryobs
@@ -613,7 +614,7 @@ ADD_TO_GLOBAL_LIST(/area/station, the_station_areas)
 
 /area/station/medical/cryo
 	name = "Cryogenics"
-	cases = list("кринженерного отделагенные камеры", "кринженерного отделагенных камер", "кринженерного отделагенным камерам", "кринженерного отделагенные камеры", "кринженерного отделагенными камерами", "кринженерного отделагенных камерах")
+	cases = list("криогенные камеры", "криогенных камерах", "криогенным камерам", "криогенные камеры", "криогенными камерами", "криогенных камерах")
 	icon_state = "cryo"
 
 /area/station/medical/genetics
@@ -803,7 +804,7 @@ ADD_TO_GLOBAL_LIST(/area/station, the_station_areas)
 
 /area/station/rnd/xenobiology
 	name = "Xenobiology Lab"
-	cases = list("ксенобинженерного отделалогия", "ксенобинженерного отделалогии", "ксенобинженерного отделалогии", "ксенобинженерного отделалогия", "ксенобинженерного отделалогией", "ксенобинженерного отделалогии")
+	cases = list("ксенобиологии", "ксенобиологии", "ксенобиология", "ксенобиологией", "ксенобиологии")
 	icon_state = "scixeno"
 
 /area/station/rnd/storage

code/game/objects/items/stacks/sheets/glass.dm

@@ -23,7 +23,7 @@ var/global/list/datum/stack_recipe/glass_phoron_recipes = list (
 
 var/global/list/datum/stack_recipe/glass_reinforced_recipes = list (
 	new/datum/stack_recipe("thin windows", /obj/structure/window/thin/reinforced, 1, time = 5, max_per_turf = 4, build_outline = TRUE),
-	new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts/reinforced, 2),
+	new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts/rglass, 2),
 	new/datum/stack_recipe("glass tile", /obj/item/stack/tile/glass/reinforced, 1, 4, 20, required_skills = list(/datum/skill/construction = SKILL_LEVEL_NOVICE)),
 	new/datum/stack_recipe("windoor", /obj/structure/windoor_assembly, 5, max_per_turf = 4, build_outline = TRUE, required_skills = list(/datum/skill/construction = SKILL_LEVEL_NOVICE)),
 )

code/game/objects/items/weapons/legcuffs.dm

@@ -47,10 +47,12 @@
 									  "<span class='warning'>You hear the operation of some mechanism.</span>")
 					//Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart.
 					feedback_add_details("handcuffs","B")
+					playsound(src,'sound/weapons/legtrap.ogg', VOL_EFFECTS_MASTER)
 		if(isanimal(AM) && !istype(AM, /mob/living/simple_animal/parrot) && !isconstruct(AM) && !isshade(AM) && !istype(AM, /mob/living/simple_animal/hostile/viscerator))
 			armed = 0
 			var/mob/living/simple_animal/SA = AM
 			SA.health -= 20
+			playsound(src,'sound/weapons/legtrap.ogg', VOL_EFFECTS_MASTER)
 
 		icon_state = "beartrap[armed]"