Merge branch 'master220' into perevod

code/defines/procs/announce.dm

@@ -13,6 +13,7 @@ GLOBAL_DATUM_INIT(event_announcement, /datum/announcement/priority/command/event
 	var/announcement_type = "Оповещение"
 	var/admin_announcement = 0 // Admin announcements are received regardless of being in range of a radio, unless you're in the lobby to prevent metagaming
 	var/language = LANGUAGE_GALACTIC_COMMON
+	var/beannounced = TRUE
 
 /datum/announcement/New(var/do_log = 0, var/new_sound = null, var/do_newscast = 0)
 	sound = new_sound
@@ -47,6 +48,8 @@ GLOBAL_DATUM_INIT(event_announcement, /datum/announcement/priority/command/event
 /datum/announcement/proc/Announce(message as text, new_title = "", new_sound = null, do_newscast = newscast, msg_sanitized = 0, from, msg_language)
 	if(!message)
 		return
+	if(!beannounced)
+		return
 
 	var/message_title = new_title ? new_title : title
 	var/message_sound = new_sound ? sound(new_sound) : sound

code/game/jobs/job/supervisor.dm

@@ -30,7 +30,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
 
 /datum/job/captain/announce(mob/living/carbon/human/H)
 	. = ..()
-	GLOB.captain_announcement.Announce("Экипажу станции, капитан [H.real_name] взошел на борт!")
+	GLOB.captain_announcement.Announce("Экипажу станции, капитан [H.real_name] взош[genderize_ru(H.gender, "ёл", "ла", "ло", "ли")] на борт!")
 
 /datum/outfit/job/captain
 	name = "Captain"

code/modules/antagonists/space_ninja/suit/gloves.dm

@@ -22,6 +22,7 @@
 	heat_protection = HANDS
 	max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
 	strip_delay = 120
+	permeability_coefficient = 1
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	armor = list("melee" = 40, "bullet" = 30, "laser" = 20,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 100, "fire" = 100, "acid" = 100)
 	///Ниндзя украл ваше бельё ( ͡° ͜ʖ ͡°)

code/modules/antagonists/space_ninja/suit/head.dm

@@ -19,6 +19,7 @@
 	armor = list("melee" = 40, "bullet" = 30, "laser" = 20,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 100, "fire" = 100, "acid" = 100)
 	blockTracking = TRUE //Roughly the only unique thing about this helmet.
 	strip_delay = 12
+	permeability_coefficient = 1
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 
 /**

code/modules/antagonists/space_ninja/suit/mask.dm

@@ -15,6 +15,7 @@
 	icon_state = "ninja_mask_classic_thermals"
 	item_state = "ninja_mask_classic_thermals"
 	strip_delay = 120
+	permeability_coefficient = 1
 	flags_inv = HIDEHEADSETS|HIDEGLASSES|HIDENAME
 	flags_cover = MASKCOVERSEYES	//We don't need to cover mouth
 	clothing_flags = BLOCK_GAS_SMOKE_EFFECT|AIRTIGHT|BLOCK_CAPSAICIN

code/modules/antagonists/space_ninja/suit/shoes.dm

@@ -21,7 +21,7 @@
 	min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
 	heat_protection = FEET
 	max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
-	permeability_coefficient = 0.01
+	permeability_coefficient = 1
 	strip_delay = 120
 	slowdown = 0
 	clothing_traits = list(TRAIT_NEGATES_GRAVITY, TRAIT_NO_SLIP_WATER)

code/modules/antagonists/space_ninja/suit/suit.dm

@@ -21,6 +21,7 @@
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	armor = list("melee" = 40, "bullet" = 30, "laser" = 20,"energy" = 30, "bomb" = 30, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
 	strip_delay = 12
+	permeability_coefficient = 1
 	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
 	flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
 	flags_inv_transparent = HIDEGLOVES|HIDEJUMPSUIT

code/modules/antagonists/space_ninja/suit/uniform.dm

@@ -7,6 +7,7 @@
 	icon_state = "ninja_under"
 	item_state = "ninja_under"
 	item_color = "ninja_under"
+	permeability_coefficient = 1
 	resistance_flags = NONE
 	sensor_mode = SENSOR_OFF //Hey who's this guy on the Spider Clan Shuttle??
 	random_sensor = FALSE

code/modules/client/preference/loadout/loadout_donor.dm

@@ -265,6 +265,70 @@
 	..()
 	gear_tweaks += new /datum/gear_tweak/color(parent = src)
 
+/datum/gear/donor/heart_meson
+	display_name = "Heart Meson Glasses"
+	path = /obj/item/clothing/glasses/meson/heart
+	donator_tier = 4
+	cost = 2
+	slot = ITEM_SLOT_EYES
+	allowed_roles = list(JOB_TITLE_CHIEF, JOB_TITLE_ENGINEER, JOB_TITLE_ATMOSTECH, JOB_TITLE_MECHANIC, JOB_TITLE_QUARTERMASTER, JOB_TITLE_MINER, JOB_TITLE_CAPTAIN, JOB_TITLE_ENGINEER_TRAINEE)
+
+/datum/gear/donor/heart_science
+	display_name = "Heart Science Glasses"
+	path = /obj/item/clothing/glasses/science/heart
+	donator_tier = 4
+	cost = 2
+	slot = ITEM_SLOT_EYES
+	allowed_roles = list(JOB_TITLE_CAPTAIN, JOB_TITLE_SCIENTIST, JOB_TITLE_ROBOTICIST, JOB_TITLE_RD, JOB_TITLE_GENETICIST, JOB_TITLE_CHEMIST, JOB_TITLE_SCIENTIST_STUDENT)
+
+/datum/gear/donor/heart_health
+	display_name = "Heart Medical Glasses"
+	path = /obj/item/clothing/glasses/hud/health/heart
+	donator_tier = 4
+	cost = 2
+	slot = ITEM_SLOT_EYES
+	allowed_roles = list(JOB_TITLE_CAPTAIN, JOB_TITLE_CMO, JOB_TITLE_INTERN, JOB_TITLE_PARAMEDIC, JOB_TITLE_VIROLOGIST, JOB_TITLE_BLUESHIELD, JOB_TITLE_PSYCHIATRIST, JOB_TITLE_DOCTOR, JOB_TITLE_CORONER)
+
+/datum/gear/donor/heart_diagnostic
+	display_name = "Heart Diagnostic Glasses"
+	path = /obj/item/clothing/glasses/hud/diagnostic/heart
+	donator_tier = 4
+	cost = 2
+	slot = ITEM_SLOT_EYES
+	allowed_roles = list(JOB_TITLE_CAPTAIN, JOB_TITLE_RD, JOB_TITLE_ROBOTICIST)
+
+/datum/gear/donor/heart_security
+	display_name = "Heart Security Glasses"
+	path = /obj/item/clothing/glasses/hud/security/sunglasses/heart
+	donator_tier = 4
+	cost = 2
+	slot = ITEM_SLOT_EYES
+	allowed_roles = list(JOB_TITLE_CAPTAIN, JOB_TITLE_DETECTIVE, JOB_TITLE_PILOT, JOB_TITLE_HOS, JOB_TITLE_WARDEN, JOB_TITLE_BLUESHIELD, JOB_TITLE_JUDGE, JOB_TITLE_OFFICER)
+
+/datum/gear/donor/heartsec_read
+	display_name = "Heart Security Glasses"
+	path = /obj/item/clothing/glasses/hud/security/sunglasses/heart/read_only
+	donator_tier = 4
+	cost = 2
+	slot = ITEM_SLOT_EYES
+	allowed_roles = list(JOB_TITLE_LAWYER)
+
+/datum/gear/donor/heart_hydroponic
+	display_name = "Heart Hydroponic Glasses"
+	path = /obj/item/clothing/glasses/hud/heart
+	donator_tier = 4
+	cost = 2
+	slot = ITEM_SLOT_EYES
+	allowed_roles = list(JOB_TITLE_CAPTAIN, JOB_TITLE_BOTANIST)
+
+/datum/gear/donor/heart_skills
+	display_name = "Heart Skills Glasses"
+	path = /obj/item/clothing/glasses/hud/skills/heart
+	donator_tier = 4
+	cost = 2
+	slot = ITEM_SLOT_EYES
+	allowed_roles = list(JOB_TITLE_CAPTAIN, JOB_TITLE_REPRESENTATIVE, JOB_TITLE_BLUESHIELD, JOB_TITLE_HOP)
+
 /datum/gear/donor/night_dress
 	display_name = "night dress, select"
 	description = "A classic night dress."

code/modules/clothing/glasses/glasses.dm

@@ -113,6 +113,12 @@
 	flash_protect = FLASH_PROTECTION_FLASH
 	tint = 1
 
+/obj/item/clothing/glasses/meson/heart
+	name = "\improper Heart Meson Glasses"
+	desc = "Модные очки в форме сердечек с встроенным ИЛС под рабочие нужды."
+	icon_state = "heart_meson"
+	item_state = "heart_meson"
+
 /obj/item/clothing/glasses/meson/night
 	name = "Night Vision Optical Meson Scanner"
 	desc = "An Optical Meson Scanner fitted with an amplified visible light spectrum overlay, providing greater visual clarity in darkness."
@@ -186,6 +192,12 @@
 	see_in_dark = 8
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE //don't render darkness while wearing these
 
+/obj/item/clothing/glasses/science/heart
+	name = "\improper Heart Science Glasses"
+	desc = "Модные очки в форме сердечек с встроенным ИЛС под рабочие нужды."
+	icon_state = "heart_science"
+	item_state = "heart_science"
+
 /obj/item/clothing/glasses/janitor
 	name = "Janitorial Goggles"
 	desc = "These'll keep the soap out of your eyes."

code/modules/clothing/glasses/hud.dm

@@ -82,6 +82,12 @@ MEDICAL
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	prescription_upgradable = FALSE
 
+/obj/item/clothing/glasses/hud/health/heart
+	name = "\improper Heart Medical Glasses"
+	desc = "Модные очки в форме сердечек с встроенным ИЛС под рабочие нужды."
+	icon_state = "heart_med"
+	item_state = "heart_med"
+
 /obj/item/clothing/glasses/hud/health/patch
 	name = "\improper Medical HUD Eyepatch"
 	desc = "A heads-up eyepatch that scans the humans in view and provides accurate data about their health status."
@@ -161,6 +167,12 @@ DIAGNOSTIC
 	item_state = "diaghudpatch"
 	prescription_upgradable = FALSE
 
+/obj/item/clothing/glasses/hud/diagnostic/heart
+	name = "\improper Heart Diagnostic Glasses"
+	desc = "Модные очки в форме сердечек с встроенным ИЛС под рабочие нужды."
+	icon_state = "heart_diagnostic"
+	item_state = "heart_diagnostic"
+
 /obj/item/clothing/glasses/hud/diagnostic/night
 	name = "\improper Night Vision Diagnostic HUD"
 	desc = "A robotics diagnostic HUD fitted with a light amplifier."
@@ -262,6 +274,15 @@ SECURITY
 		SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
 	)
 
+/obj/item/clothing/glasses/hud/security/sunglasses/heart
+	name = "\improper Heart Security Glasses"
+	desc = "Модные очки в форме сердечек с встроенным ИЛС под рабочие нужды."
+	icon_state = "heart_sec"
+	item_state = "heart_sec"
+
+/obj/item/clothing/glasses/hud/security/sunglasses/heart/read_only
+	examine_extensions = EXAMINE_HUD_SECURITY_READ
+
 /obj/item/clothing/glasses/hud/security/sunglasses/tacticool
 	name = "security tactical glasses"
 	desc = "Ballistic glasses with a security HUD. Gives you tacticool protection and selfish increase. The elastic band allows it to be worn over a helmet."
@@ -358,6 +379,12 @@ HYDROPONIC
 	item_state = "hydrohudpatch"
 	prescription_upgradable = FALSE
 
+/obj/item/clothing/glasses/hud/heart
+	name = "\improper Heart Hydroponic Glasses"
+	desc = "Модные очки в форме сердечек с встроенным ИЛС под рабочие нужды."
+	icon_state = "heart_hydro"
+	item_state = "heart_hydro"
+
 /obj/item/clothing/glasses/hud/hydroponic/night
 	name = "\improper Night Vision Hydroponic HUD"
 	desc = "A hydroponic HUD fitted with a light amplifier."
@@ -421,6 +448,12 @@ SKILLS
 	item_state = "skillhudpatch"
 	prescription_upgradable = FALSE
 
+/obj/item/clothing/glasses/hud/skills/heart
+	name = "\improper Heart Skills Glasses"
+	desc = "Модные очки в форме сердечек с встроенным ИЛС под рабочие нужды."
+	icon_state = "heart_skill"
+	item_state = "heart_skill"
+
 /obj/item/clothing/glasses/hud/skills/sunglasses
 	name = "skills sunglasses"
 	desc = "Sunglasses with a build-in skills HUD, showing the employment history of nearby NT crew members."

code/modules/mob/living/simple_animal/friendly/animals_named.dm

@@ -55,13 +55,15 @@
 /mob/living/simple_animal/pet/cat/white/Penny
 	name = "Копейка"
 	desc = "Любит таскать монетки и мелкие предметы. Успевайте прятать их!"
+	icon_state = "penny"
 	unique_pet = TRUE
 	gold_core_spawnable = NO_SPAWN
 	resting = TRUE
 
 /mob/living/simple_animal/pet/cat/birman/Crusher
 	name = "Бедокур"	//Не цель для воров
 	desc = "Любит крушить всё что не прикручено. Нужно вовремя прибираться."
+	icon_state = "crusher"
 	unique_pet = TRUE
 	gold_core_spawnable = NO_SPAWN
 	resting = TRUE