diff --git a/Content.Client/Doors/AirlockSystem.cs b/Content.Client/Doors/AirlockSystem.cs index 30aca58b7e..b6265228c3 100644 --- a/Content.Client/Doors/AirlockSystem.cs +++ b/Content.Client/Doors/AirlockSystem.cs @@ -14,20 +14,10 @@ public sealed class AirlockSystem : SharedAirlockSystem public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnBeforeDoorClosed); SubscribeLocalEvent(OnComponentStartup); SubscribeLocalEvent(OnAppearanceChange); } - - // А нужен ли ты блять - private void OnBeforeDoorClosed(EntityUid uid, AirlockComponent airlock, BeforeDoorClosedEvent args) - { - if (_appearanceSystem.TryGetData(uid, DoorVisuals.BoltLights, out var boltLights) && boltLights) - { - args.Cancel(); - } - } - + private void OnComponentStartup(EntityUid uid, AirlockComponent comp, ComponentStartup args) { // Has to be on component startup because we don't know what order components initialize in and running this before DoorComponent inits _will_ crash. diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs index b6f1be499a..81f2c9f732 100644 --- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs +++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs @@ -1163,26 +1163,17 @@ namespace Content.Client.Preferences.UI var hairMarking = Profile.Appearance.HairStyleId switch { HairStyles.DefaultHairStyle => new List(), - _ => [new Marking(Profile.Appearance.HairStyleId, [Profile.Appearance.HairColor])], + _ => new List { new(Profile.Appearance.HairStyleId, new List { Profile.Appearance.HairColor }) }, }; var facialHairMarking = Profile.Appearance.FacialHairStyleId switch { HairStyles.DefaultFacialHairStyle => new List(), - _ => - [ - new Marking(Profile.Appearance.FacialHairStyleId, [Profile.Appearance.FacialHairColor]) - ], + _ => new List { new(Profile.Appearance.FacialHairStyleId, new List { Profile.Appearance.FacialHairColor }) }, }; - _hairPicker.UpdateData( - hairMarking, - Profile.Species, - 1); - _facialHairPicker.UpdateData( - facialHairMarking, - Profile.Species, - 1); + _hairPicker.UpdateData(hairMarking, Profile.Species, 1); + _facialHairPicker.UpdateData(facialHairMarking, Profile.Species, 1); } private void UpdateCMarkingsHair() diff --git a/Content.Server/_White/Cult/Items/Systems/VoidTeleportSystem.cs b/Content.Server/_White/Cult/Items/Systems/VoidTeleportSystem.cs index 2276460aa3..e7bc217c99 100644 --- a/Content.Server/_White/Cult/Items/Systems/VoidTeleportSystem.cs +++ b/Content.Server/_White/Cult/Items/Systems/VoidTeleportSystem.cs @@ -30,7 +30,7 @@ public sealed class VoidTeleportSystem : EntitySystem [Dependency] private readonly TransformSystem _transform = default!; [Dependency] private readonly PointLightSystem _pointLight = default!; [Dependency] private readonly PullingSystem _pulling = default!; - [Dependency] private readonly RobustRandom _random = default!; + [Dependency] private readonly IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs b/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs index 881cc1daae..b0d6ef0c73 100644 --- a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs +++ b/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs @@ -27,7 +27,6 @@ namespace Content.Server.Bed.Sleep SubscribeLocalEvent(OnSeeAttempt); SubscribeLocalEvent(OnPointAttempt); SubscribeLocalEvent(OnTryEmote); // WD - SubscribeLocalEvent(OnTryEmote); // WD } private void OnTryEmote(EntityUid uid, SleepingComponent component, EmoteAttemptEvent args) // WD diff --git a/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl b/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl index 7b411db488..dfc6e3cecd 100644 --- a/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl +++ b/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl @@ -1,16 +1,18 @@ health-analyzer-window-no-patient-data-text = Пациент отсутствует -health-analyzer-window-no-data = Н/Д -health-analyzer-window-entity-current-alive-status-text = Статус -health-analyzer-window-entity-current-alive-status-alive-text = Жив -health-analyzer-window-entity-current-alive-status-critical-text = Критическое -health-analyzer-window-entity-current-alive-status-dead-text = Мёртв -health-analyzer-window-entity-temperature-text = Температура -health-analyzer-window-entity-blood-level-text = Уровень крови +health-analyzer-window-entity-unknown-text = неизвестный +health-analyzer-window-entity-health-text = Состояние {$entityName}: +health-analyzer-window-entity-temperature-text = Температура: {$temperature} +health-analyzer-window-entity-blood-level-text = Уровень крови: {$bloodLevel} +health-analyzer-window-entity-bleeding-text = Пациент истекает кровью! health-analyzer-window-entity-damage-total-text = Общие повреждения health-analyzer-window-damage-group-text = {$damageGroup}: {$amount} health-analyzer-window-damage-type-text = {$damageType}: {$amount} health-analyzer-window-damage-type-duplicate-text = {$damageType}: {$amount} (дубликат) +health-analyzer-window-scan-mode-text = Режим сканирования: +health-analyzer-window-scan-mode-active = ВКЛЮЧЕН +health-analyzer-window-scan-mode-inactive = ВЫКЛЮЧЕН + health-analyzer-window-damage-group-Brute = Механические: {$amount} health-analyzer-window-damage-type-Blunt = Удары: {$amount} health-analyzer-window-damage-type-Slash = Разрезы: {$amount} diff --git a/Resources/Locale/ru-RU/white/medical/bodyscanner/body-scanner-console-component.ftl b/Resources/Locale/ru-RU/white/medical/bodyscanner/body-scanner-console-component.ftl index 3224dfa770..61f478e96c 100644 --- a/Resources/Locale/ru-RU/white/medical/bodyscanner/body-scanner-console-component.ftl +++ b/Resources/Locale/ru-RU/white/medical/bodyscanner/body-scanner-console-component.ftl @@ -19,21 +19,21 @@ body-scanner-console-window-damage-group-text = {$damageGroup}: {$amount} body-scanner-console-window-damage-type-text = {$damageType}: {$amount} body-scanner-console-window-damage-type-duplicate-text = {$damageType}: {$amount} (дубликат) -body-scanner-console-window-damage-group-Brute = Механические: {$amount} -body-scanner-console-window-damage-type-Blunt = Удары: {$amount} -body-scanner-console-window-damage-type-Slash = Разрезы: {$amount} -body-scanner-console-window-damage-type-Piercing = Уколы: {$amount} +body-scanner-console-window-damage-group-Brute = Механические +body-scanner-console-window-damage-type-Blunt = Удары +body-scanner-console-window-damage-type-Slash = Разрезы +body-scanner-console-window-damage-type-Piercing = Уколы -body-scanner-console-window-damage-group-Burn = Ожоги: {$amount} -body-scanner-console-window-damage-type-Heat = Термические: {$amount} -body-scanner-console-window-damage-type-Laser = Лазерный: {$amount} -body-scanner-console-window-damage-type-Shock = Электрические: {$amount} -body-scanner-console-window-damage-type-Cold = Обморожение: {$amount} -body-scanner-console-window-damage-type-Caustic = Кислотные: {$amount} +body-scanner-console-window-damage-group-Burn = Ожоги +body-scanner-console-window-damage-type-Heat = Термические +body-scanner-console-window-damage-type-Laser = Лазерный +body-scanner-console-window-damage-type-Shock = Электрические +body-scanner-console-window-damage-type-Cold = Обморожение +body-scanner-console-window-damage-type-Caustic = Кислотные -body-scanner-console-window-damage-group-Airloss = Нехватка воздуха: {$amount} -body-scanner-console-window-damage-type-Asphyxiation = Удушение: {$amount} -body-scanner-console-window-damage-type-Bloodloss = Кровопотеря: {$amount} +body-scanner-console-window-damage-group-Airloss = Нехватка воздуха +body-scanner-console-window-damage-type-Asphyxiation = Удушение +body-scanner-console-window-damage-type-Bloodloss = Кровопотеря body-scanner-console-window-damage-group-Toxin = Токсины: {$amount} body-scanner-console-window-damage-type-Poison = Яды: {$amount} diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml index b0e17ab884..5fa83e740d 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml @@ -13,9 +13,6 @@ layers: - map: ["enum.PoweredLightLayers.Base"] state: base - - map: ["enum.PoweredLightLayers.Glow"] - state: glow - shader: unshaded state: base - type: Fixtures fixtures: diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index f5d9043ab6..35c7d89aca 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1213,7 +1213,6 @@ id: FloorShuttleWhite name: tiles-white-shuttle-floor sprite: /Textures/Tiles/shuttlewhite.png - variants: 4 placementVariants: - 1.0 - 1.0 @@ -1267,7 +1266,6 @@ id: FloorShuttleBlue name: tiles-blue-shuttle-floor sprite: /Textures/Tiles/shuttleblue.png - variants: 4 placementVariants: - 1.0 - 1.0 @@ -1285,7 +1283,6 @@ id: FloorShuttleOrange name: tiles-orange-shuttle-floor sprite: /Textures/Tiles/shuttleorange.png - variants: 4 placementVariants: - 1.0 - 1.0 @@ -1303,7 +1300,6 @@ id: FloorShuttlePurple name: tiles-purple-shuttle-floor sprite: /Textures/Tiles/shuttlepurple.png - variants: 4 placementVariants: - 1.0 - 1.0 @@ -1321,7 +1317,6 @@ id: FloorShuttleRed name: tiles-red-shuttle-floor sprite: /Textures/Tiles/shuttlered.png - variants: 4 placementVariants: - 1.0 - 1.0