From b79ee83a211e5cf1234db6832f7c5d704a700efe Mon Sep 17 00:00:00 2001 From: ReWAFFlution <153686236+ReWAFFlution@users.noreply.github.com> Date: Sun, 7 Sep 2025 12:06:53 +0300 Subject: [PATCH 01/24] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D0=BD=D0=BA?= =?UTF-8?q?=D0=B0=20=D1=89=D0=B8=D1=82=D0=B0=20=D0=B8=20=D0=B5=D0=B3=D0=BE?= =?UTF-8?q?=20=D0=B7=D0=B4=D0=BE=D1=80=D0=BE=D0=B2=D1=8C=D0=B5=20(#3082)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../health-examinable-shield.ftl | 24 ++++++++++ .../health-examinable-shield.ftl | 24 ++++++++++ .../Entities/Objects/Shields/shields.yml | 48 ++++++++++++++++--- .../Entities/Objects/Shields/shields.yml | 13 ++++- 4 files changed, 102 insertions(+), 7 deletions(-) create mode 100644 Resources/Locale/en-US/_strings/_sunrise/health-examinable/health-examinable-shield.ftl create mode 100644 Resources/Locale/ru-RU/_strings/_sunrise/health-examinable/health-examinable-shield.ftl diff --git a/Resources/Locale/en-US/_strings/_sunrise/health-examinable/health-examinable-shield.ftl b/Resources/Locale/en-US/_strings/_sunrise/health-examinable/health-examinable-shield.ftl new file mode 100644 index 0000000000..b71265fed3 --- /dev/null +++ b/Resources/Locale/en-US/_strings/_sunrise/health-examinable/health-examinable-shield.ftl @@ -0,0 +1,24 @@ +health-examinable-shield-none = There is no obvious damage to be seen. + +health-examinable-shield-Blunt-8 = [color=orange]Shield has minor dents.[/color] +health-examinable-shield-Blunt-15 = [color=red]Shield has several visible dents.[/color] +health-examinable-shield-Blunt-30 = [color=crimson]Shield is badly deformed from impacts![/color] +health-examinable-shield-Blunt-50 = [color=crimson]Shield is nearly shattered![/color] + +health-examinable-shield-Slash-8 = [color=orange]Shield has light scratches.[/color] +health-examinable-shield-Slash-15 = [color=red]Shield is visibly cut in several places.[/color] +health-examinable-shield-Slash-30 = [color=crimson]Shield is deeply gashed and cracked![/color] +health-examinable-shield-Slash-50 = [color=crimson]Shield is nearly shattered![/color] + +health-examinable-shield-Piercing-8 = [color=orange]Shield has small puncture marks.[/color] +health-examinable-shield-Piercing-15 = [color=red]Shield is riddled with holes.[/color] +health-examinable-shield-Piercing-30 = [color=crimson]Shield has large, dangerous breaches![/color] +health-examinable-shield-Piercing-50 = [color=crimson]Shield is nearly shattered![/color] + +health-examinable-shield-Heat-8 = [color=orange]Shield surface is slightly scorched.[/color] +health-examinable-shield-Heat-15 = [color=red]Shield is charred and blackened.[/color] +health-examinable-shield-Heat-30 = [color=crimson]Shield is melting under extreme heat![/color] +health-examinable-shield-Heat-50 = [color=crimson]Shield almost burns in your hand![/color] + +health-examinable-shield-Mangleness-15 = [color=orange]Shield looks fused.[/color] +health-examinable-shield-Mangleness-35 = [color=red]Shield looks like scrap metal![/color] diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/health-examinable/health-examinable-shield.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/health-examinable/health-examinable-shield.ftl new file mode 100644 index 0000000000..5102ac1aa4 --- /dev/null +++ b/Resources/Locale/ru-RU/_strings/_sunrise/health-examinable/health-examinable-shield.ftl @@ -0,0 +1,24 @@ +health-examinable-shield-none = Видимые повреждения щита отсутствуют. + +health-examinable-shield-Blunt-8 = [color=orange]Щит имеет небольшие вмятины.[/color] +health-examinable-shield-Blunt-15 = [color=red]На щите несколько заметных вмятин.[/color] +health-examinable-shield-Blunt-30 = [color=crimson]Щит сильно деформирован от ударов![/color] +health-examinable-shield-Blunt-50 = [color=crimson]Щит почти раскрошен от сокрушительной силы![/color] + +health-examinable-shield-Slash-8 = [color=orange]Щит имеет лёгкие царапины.[/color] +health-examinable-shield-Slash-15 = [color=red]На щите видны глубокие порезы.[/color] +health-examinable-shield-Slash-30 = [color=crimson]Щит изрезан и потрескался![/color] +health-examinable-shield-Slash-50 = [color=crimson]Щит едва держится, разодранный порезами![/color] + +health-examinable-shield-Piercing-8 = [color=orange]Щит имеет маленькие пробоины.[/color] +health-examinable-shield-Piercing-15 = [color=red]Щит изрешечён дырами.[/color] +health-examinable-shield-Piercing-30 = [color=crimson]В щите зияют крупные опасные пробоины![/color] +health-examinable-shield-Piercing-50 = [color=crimson]Щит разорван на части от колющего урона![/color] + +health-examinable-shield-Heat-8 = [color=orange]Поверхность щита слегка оплавлена.[/color] +health-examinable-shield-Heat-15 = [color=red]Щит почернел и обуглился.[/color] +health-examinable-shield-Heat-30 = [color=crimson]Щит плавится от экстремального жара![/color] +health-examinable-shield-Heat-50 = [color=crimson]Щит почти рассыпался в пламени![/color] + +health-examinable-shield-Mangleness-15 = [color=orange]Щит выглядит сплавленным.[/color] +health-examinable-shield-Mangleness-35 = [color=red]Щит выглядит как металлолом![/color] diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index 2666b1c2b5..ed71f4e317 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -59,12 +59,23 @@ max: 2 - type: StaticPrice price: 100 + - type: HealthExaminable #Sunrise-Start + examinableTypes: + - Blunt + - Slash + - Piercing + - Heat + - Mangleness + locPrefix: shield + - type: ClothingSpeedModifier + sprintModifier: 0.95 + - type: HeldSpeedModifier #Sunrise-End #Security Shields - type: entity name: riot shield - parent: [ BaseShield, BaseSecurityContraband ] + parent: [ RepairableShield, BaseSecurityContraband, BaseShield ] # Sunrise-Edit id: RiotShield description: A large tower shield. Good for controlling crowds. components: @@ -97,7 +108,7 @@ - type: entity name: riot strobe shield - parent: [ BaseShield, BaseSecurityContraband, MachineComponentSounds ] + parent: [ RepairableShield, BaseSecurityContraband, MachineComponentSounds, BaseShield ] # Sunrise-Edit id: RiotShieldStrobe description: A large tower shield with atached Flash. Good for controlling crowds. components: @@ -191,7 +202,7 @@ - type: entity name: laser shield - parent: [ BaseShield, BaseSecurityContraband ] + parent: [ RepairableShield, BaseSecurityContraband, BaseShield ] # Sunrise-Edit id: RiotLaserShield description: A shield built for withstanding lasers, but not much else. components: @@ -199,6 +210,7 @@ state: riot_laser-icon - type: Item heldPrefix: riot_laser + size: Ginormous # Sunrise-Edit Я не ебу почему он стал маленьким - type: Blocking passiveBlockModifier: coefficients: @@ -217,13 +229,14 @@ - type: entity name: ballistic shield - parent: [ BaseShield, BaseSecurityContraband ] + parent: [ RepairableShield, BaseSecurityContraband, BaseShield ] # Sunrise-Edit id: RiotBulletShield description: A shield built for protecting against ballistics, but not much else. components: - type: Sprite state: riot_bullet-icon - type: Item + size: Ginormous # Sunrise-Edit Я не ебу почему он стал маленьким heldPrefix: riot_bullet - type: Blocking passiveBlockModifier: @@ -346,8 +359,8 @@ - type: entity name: makeshift shield + parent: [ BaseShield, RepairableShield ] # Sunrise-Edit id: MakeshiftShield - parent: BaseShield description: A rundown looking shield, not good for much. components: - type: Sprite @@ -626,6 +639,9 @@ startingCharge: 1500 - type: PowerCellDraw useRate: 2.5 + - type: ClothingSpeedModifier + sprintModifier: 1 + - type: HeldSpeedModifier # Sunrise-End - type: entity @@ -644,7 +660,7 @@ - type: entity name: telescopic shield - parent: BaseShield + parent: [ RepairableShield, BaseShield, BaseSecurityContraband ] # Sunrise-Edit id: TelescopicShield description: An advanced riot shield made of lightweight materials that collapses for easy storage. components: @@ -711,3 +727,23 @@ max: 2 - type: StaticPrice price: 150 + +- type: entity # Sunrise-Start + name: repairable shield + parent: BaseItem + id: RepairableShield + description: A shield! + abstract: true + components: + - type: Item + size: Ginormous + - type: Repairable + doAfterDelay: 4 + damage: + types: + Blunt: -25 + Slash: -25 + Piercing: -25 + Heat: -25 + Structural: -25 + Mangleness: 7.5 # Sunrise-End diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Shields/shields.yml index 4364e21083..1524b7d8bb 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Shields/shields.yml @@ -1,6 +1,6 @@ - type: entity name: paladin shield - parent: [ BaseItem, BaseMajorContraband ] # Easier to remake it than inheret it, due to wiz keeping all shields in one folder and mine doing the opposite, due to the suitslot sprites. + parent: [ RepairableShield, BaseMajorContraband ] # Sunrise-Edit id: PaladinShield description: A shield for a true paladin! Good at deflecting hits with swords and absorbing the impact from bats, but not much else. components: @@ -67,6 +67,17 @@ SheetSteel: min: 5 max: 13 + - type: HealthExaminable #Sunrise-Start + examinableTypes: + - Blunt + - Slash + - Piercing + - Heat + - Mangleness + locPrefix: shield + - type: ClothingSpeedModifier + sprintModifier: 0.95 + - type: HeldSpeedModifier #Sunrise-End - type: entity name: paladin greatshield From e65af59a4bc3a5c9d805e237caee7c6ad4642f44 Mon Sep 17 00:00:00 2001 From: Sunrise-Bot Date: Sun, 7 Sep 2025 12:08:02 +0300 Subject: [PATCH 02/24] Automatic changelog update --- Resources/Changelog/ChangelogSunrise.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index 01c3d3ce36..54cca3eba3 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -21972,3 +21972,18 @@ id: 1435 time: '2025-09-04T23:34:23.0000000+00:00' url: https://github.com/space-sunrise/sunrise-station/pull/3137 +- author: ReWAFFlution + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u043E\u0437\ + \u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0447\u0438\u043D\u0438\u0442\ + \u044C \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u0449\u0438\u0442\ + \u044B \u0441\u0432\u0430\u0440\u043A\u043E\u0439." + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u043E\u0437\ + \u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u043A \u043E\u0441\u043C\u043E\ + \u0442\u0440\u0443 \u043F\u043E\u0432\u0440\u0435\u0436\u0434\u0435\u043D\u0438\ + \u0439 \u0449\u0438\u0442\u043E\u0432." + type: Add + id: 1436 + time: '2025-09-07T09:06:53.0000000+00:00' + url: https://github.com/space-sunrise/sunrise-station/pull/3082 From d6747fa9ab8e9b2426b7240d56846cafd7f30067 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Mon, 8 Sep 2025 20:26:10 +0300 Subject: [PATCH 03/24] Add "Replays" button to escape menu and lobby with configurable URL (#3173) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com> --- Content.Client/Lobby/UI/LobbyGui.xaml | 2 ++ Content.Client/Lobby/UI/LobbyGui.xaml.cs | 9 +++++++++ Content.Client/Options/UI/EscapeMenu.xaml | 1 + .../Systems/EscapeMenu/EscapeUIController.cs | 7 +++++++ Content.Shared/_Sunrise/SunriseCCVars/SunriseCCVars.cs | 6 ++++++ .../_strings/_sunrise/escape-menu/ui/escape-menu.ftl | 1 + Resources/Locale/en-US/_strings/lobby/lobby-gui.ftl | 1 + .../_strings/_sunrise/escape-menu/ui/escape-menu.ftl | 3 ++- Resources/Locale/ru-RU/_strings/lobby/lobby-gui.ftl | 1 + 9 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml index 2d2c6a91fd..4963b9b1bf 100644 --- a/Content.Client/Lobby/UI/LobbyGui.xaml +++ b/Content.Client/Lobby/UI/LobbyGui.xaml @@ -178,6 +178,8 @@