diff --git a/Content.Client/_Sunrise/FactionWeaponBlockerSystem/FactionWeaponBlockerСomponent.cs b/Content.Client/_Sunrise/FactionWeaponBlockerSystem/FactionWeaponBlockerComponent.cs similarity index 100% rename from Content.Client/_Sunrise/FactionWeaponBlockerSystem/FactionWeaponBlockerСomponent.cs rename to Content.Client/_Sunrise/FactionWeaponBlockerSystem/FactionWeaponBlockerComponent.cs diff --git a/Content.Server/_Sunrise/FactionClothingBlockerSystem/FactionClothingBlockerСomponent.cs b/Content.Server/_Sunrise/FactionClothingBlockerSystem/FactionClothingBlockerComponent.cs similarity index 100% rename from Content.Server/_Sunrise/FactionClothingBlockerSystem/FactionClothingBlockerСomponent.cs rename to Content.Server/_Sunrise/FactionClothingBlockerSystem/FactionClothingBlockerComponent.cs diff --git a/Content.Server/_Sunrise/FactionWeaponBlockerSystem/FactionWeaponBlockerСomponent.cs b/Content.Server/_Sunrise/FactionWeaponBlockerSystem/FactionWeaponBlockerComponent.cs similarity index 100% rename from Content.Server/_Sunrise/FactionWeaponBlockerSystem/FactionWeaponBlockerСomponent.cs rename to Content.Server/_Sunrise/FactionWeaponBlockerSystem/FactionWeaponBlockerComponent.cs diff --git a/Content.Shared/_Sunrise/FactionWeaponBlockerSystem/SharedFactionWeaponBlockerСomponent.cs b/Content.Shared/_Sunrise/FactionWeaponBlockerSystem/SharedFactionWeaponBlockerComponent.cs similarity index 100% rename from Content.Shared/_Sunrise/FactionWeaponBlockerSystem/SharedFactionWeaponBlockerСomponent.cs rename to Content.Shared/_Sunrise/FactionWeaponBlockerSystem/SharedFactionWeaponBlockerComponent.cs diff --git a/Resources/Audio/Lobby/title3.ogg b/Resources/Audio/Lobby/title3.ogg new file mode 100644 index 0000000000..0bb1bf7763 Binary files /dev/null and b/Resources/Audio/Lobby/title3.ogg differ diff --git a/Resources/Locale/ru-RU/_sunrise/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/_sunrise/preferences/loadout-groups.ftl new file mode 100644 index 0000000000..ea84f1fd94 --- /dev/null +++ b/Resources/Locale/ru-RU/_sunrise/preferences/loadout-groups.ftl @@ -0,0 +1,7 @@ +loadout-group-pants = Трусы +loadout-group-bra = Бюстгальтер +loadout-group-socks = Носки +loadout-group-brigmedic-backpack = Рюкзак бригмедика +loadout-group-brigmedic-jumpsuit = Униформа бригмедика +loadout-group-blueshield-backpack = Офицер «Синий Щит», рюкзак +loadout-group-blueshield-jumpsuit = Офицер «Синий Щит», комбинезон \ No newline at end of file diff --git a/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl index 7927a1671f..a2edfbb608 100644 --- a/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl @@ -1,5 +1,2 @@ loadout-group-inventory = Мой инвентарь -loadout-group-psychologist-backpack = Рюкзак психолога - -loadout-group-brigmedic-backpack = Рюкзак бригмедика -loadout-group-brigmedic-jumpsuit = Униформа бригмедика +loadout-group-psychologist-backpack = Рюкзак психолога \ No newline at end of file diff --git a/Resources/Locale/ru-RU/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/preferences/loadout-groups.ftl index 87fc4389d8..e11c7be1df 100644 --- a/Resources/Locale/ru-RU/preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/preferences/loadout-groups.ftl @@ -153,9 +153,4 @@ loadout-group-paramedic-backpack = Парамедик, рюкзак # Wildcards loadout-group-reporter-jumpsuit = Репортёр, комбинезон loadout-group-boxer-jumpsuit = Боксёр, комбинезон -loadout-group-boxer-gloves = Боксёр, перчатки - -# Sunrise-edit -loadout-group-pants = Трусы -loadout-group-bra = Бюстгальтер -loadout-group-socks = Носки +loadout-group-boxer-gloves = Боксёр, перчатки \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index dd43ec4094..20dba69c08 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -194,7 +194,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockVendomatFilled - cost: 1200 + cost: 1290 category: cargoproduct-category-name-service group: market diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml index a42e16d353..500eff7e34 100644 --- a/Resources/Prototypes/SoundCollections/lobby.yml +++ b/Resources/Prototypes/SoundCollections/lobby.yml @@ -4,6 +4,7 @@ - /Audio/Lobby/absconditus.ogg - /Audio/Lobby/space_asshole.ogg - /Audio/Lobby/endless_space.ogg + - /Audio/Lobby/title3.ogg - /Audio/_Sunrise/Music/peace_in_the_lags.ogg # Sunrise-Music - /Audio/_Sunrise/Music/The_first_day_on_orbit.ogg # Sunrise-Music - /Audio/_Sunrise/Music/Spectral_Synth.ogg # Sunrise-Music diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml index eca09f198e..bd91f83230 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml @@ -37,11 +37,6 @@ name: КПК офицера «синий щит» description: Охуенный стиль. components: - - type: Pda - id: BlueShieldIDCard - state: pda-blueshield - - type: Icon - state: pda-blueshield - type: Sprite sprite: _Sunrise/Objects/pda.rsi layers: @@ -54,3 +49,9 @@ map: [ "enum.PdaVisualLayers.IdLight" ] shader: "unshaded" visible: false + - type: Pda + id: BlueShieldIDCard + state: pda-blueshield + - type: Icon + sprite: _Sunrise/Objects/pda.rsi + state: pda-blueshield \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml index c05426d84d..828183b99b 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml @@ -109,7 +109,7 @@ - type: loadoutGroup id: BlueShieldBackpack - name: Офицер «Синий Щит», рюкзак + name: loadout-group-blueshield-backpack loadouts: - BlueShieldBackpack - BlueShieldSatchel @@ -117,7 +117,7 @@ - type: loadoutGroup id: BlueShieldJumpsuit - name: Офицер «Синий Щит», комбинезон + name: loadout-group-blueshield-jumpsuit loadouts: - BlueShieldJumpsuit - BlueShieldJumpskirt diff --git a/Resources/Prototypes/audio.yml b/Resources/Prototypes/audio.yml index 24df3239b5..61d930282c 100644 --- a/Resources/Prototypes/audio.yml +++ b/Resources/Prototypes/audio.yml @@ -203,7 +203,6 @@ - /Audio/Ambience/spookyspace1.ogg - /Audio/Ambience/spookyspace2.ogg - /Audio/Ambience/ambispace2.ogg - - /Audio/Lobby/title2.ogg - type: soundCollection id: AmbienceSpooky diff --git a/Tools/check_crlf.py b/Tools/check_crlf.py index d691e15c70..3d809d4db6 100755 --- a/Tools/check_crlf.py +++ b/Tools/check_crlf.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 import subprocess +import os from typing import Iterable def main() -> int: @@ -25,7 +26,10 @@ def get_text_files() -> Iterable[str]: yield x.strip() def is_file_crlf(path: str) -> bool: - # https://stackoverflow.com/a/29697732/4678631 + if '\\' in path: + print(f"File {path} contains a backslash in its name.") + return True + with open(path, "rb") as f: for line in f: if line.endswith(b"\r\n"): @@ -33,4 +37,4 @@ def is_file_crlf(path: str) -> bool: return False -exit(main()) +exit(main()) \ No newline at end of file