-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upstream2107 (Требуется тестирование) (#133)
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это
комментарии - они не будут видны в PR. -->
## Описание PR
<!-- Ниже опишите ваш Pull Request. Что он изменяет? На что еще это
может повлиять? Постарайтесь описать все внесённые вами изменения! -->
## Changelog.yml
```yml
- author: ShadowCommander
changes:
- message: Players can now use melee attacks and shoves while dragging an entity
in their active hand.
type: Tweak
id: 6900
time: '2024-07-11T04:48:00.0000000+00:00'
url: space-wizards/space-station-14#29703
- author: Cojoke-dot
changes:
- message: You can no longer shoot out of crates with guns
type: Fix
id: 6901
time: '2024-07-11T05:14:49.0000000+00:00'
url: space-wizards/space-station-14#28961
- author: Cojoke-dot
changes:
- message: The Spray Painter can now be used to paint glass airlocks to look like
regular glass airlocks.
type: Tweak
id: 6902
time: '2024-07-11T05:33:20.0000000+00:00'
url: space-wizards/space-station-14#29869
- author: MFMessage
changes:
- message: Picking a ghost role as an admin will now deadmin.
type: Fix
id: 6903
time: '2024-07-11T05:53:15.0000000+00:00'
url: space-wizards/space-station-14#29790
- author: Winkarst-cpu
changes:
- message: Admin notes popups are now more readable.
type: Tweak
id: 6904
time: '2024-07-11T14:03:22.0000000+00:00'
url: space-wizards/space-station-14#29909
- author: jonathanargo
changes:
- message: Muskets are now wieldable.
type: Tweak
id: 6905
time: '2024-07-12T09:16:21.0000000+00:00'
url: space-wizards/space-station-14#29910
- author: themias
changes:
- message: Notice boards can now be built on walls
type: Fix
id: 6906
time: '2024-07-12T09:18:32.0000000+00:00'
url: space-wizards/space-station-14#29851
- author: slarticodefast
changes:
- message: Stun batons, stun prods and banana cream pies now fly like other throwing
weapons when thrown.
type: Fix
id: 6907
time: '2024-07-12T09:19:24.0000000+00:00'
url: space-wizards/space-station-14#29883
- author: Plykiya
changes:
- message: Dropping an item while in a container now places the item in the container.
type: Fix
id: 6908
time: '2024-07-12T09:24:08.0000000+00:00'
url: space-wizards/space-station-14#29900
- author: coffeeware, slarticodefast
changes:
- message: Fixed items thrown very fast not being in the air. In particular this
fixes the pneumatic cannon.
type: Fix
- message: Buffed base hand throwing speed by 10% to be more similar to before the
recent throwing changes.
type: Tweak
id: 6909
time: '2024-07-12T10:32:47.0000000+00:00'
url: space-wizards/space-station-14#29935
- author: themias
changes:
- message: Timers can now be deconstructed
type: Fix
id: 6910
time: '2024-07-12T11:38:59.0000000+00:00'
url: space-wizards/space-station-14#29917
- author: jonathanargo
changes:
- message: Hard hat icon sprites are now centered correctly.
type: Fix
id: 6911
time: '2024-07-12T15:00:40.0000000+00:00'
url: space-wizards/space-station-14#29953
- author: lzk228
changes:
- message: Secure windoors now use reinforced glass damage modifier.
type: Fix
id: 6912
time: '2024-07-13T04:03:16.0000000+00:00'
url: space-wizards/space-station-14#29941
- author: Tayrtahn
changes:
- message: Antag objective total difficulty is now properly capped.
type: Fix
id: 6913
time: '2024-07-13T04:14:30.0000000+00:00'
url: space-wizards/space-station-14#29830
- author: EmoGarbage404
changes:
- message: Added wristwatches for telling time.
type: Add
id: 6914
time: '2024-07-13T06:09:19.0000000+00:00'
url: space-wizards/space-station-14#29550
- author: TheShuEd
changes:
- message: Added diamonds ore!
type: Add
- message: Diamonds can now be sold at a bargain price.
type: Add
id: 6915
time: '2024-07-13T12:15:57.0000000+00:00'
url: space-wizards/space-station-14#25750
- author: coffeeware
changes:
- message: Lizards will no longer lose their snouts when equipping head bandanas
type: Fix
id: 6916
time: '2024-07-14T02:59:45.0000000+00:00'
url: space-wizards/space-station-14#29979
```
## Admin.yml
```yml
- author: Chief-Engineer
changes:
- message: Baby jail no longer prevents accounts with no prior connections from
connecting
type: Fix
id: 45
time: '2024-07-11T05:14:01.0000000+00:00'
url: space-wizards/space-station-14#29896
```
**Проверки**
<!-- Выполнение всех следующих действий, если это приемлемо для вида
изменений сильно ускорит разбор вашего PR -->
- [x] PR полностью завершён и мне не нужна помощь чтобы его закончить.
- [x] Я внимательно просмотрел все свои изменения и багов в них не
нашёл.
- [x] Я запускал локальный сервер со своими изменениями и всё
протестировал.
- [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR
этого не требует.
**Изменения**
<!--
Здесь вы можете написать список изменений, который будет автоматически
добавлен в игру, когда ваш PR будет принят.
В журнал изменений следует помещать только то, что действительно важно
игрокам.
В списке изменений тип значка не является часть предложения, поэтому
явно указывайте - Добавлен, Удалён, Изменён.
плохо: - add: Новый инструмент для инженеров
хорошо: - add: Добавлен новый инструмент для инженеров
Вы можете указать своё имя после символа 🆑 именно оно будет
отображаться в журнале изменений (иначе будет использоваться ваше имя на
GitHub)
Например: 🆑 Ian
-->
🆑 Шрёдька
- tweak: Подтянуты изменения с корвакса, 21.07.24.- Loading branch information
Showing
478 changed files
with
94,630 additions
and
85,603 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -60,33 +60,22 @@ jobs: | |
| - name: Package client | ||
| run: dotnet run --project Content.Packaging client --no-wipe-release | ||
|
|
||
| - name: Update Build Info | ||
| env: | ||
| FORK_ID: ${{ vars.FORK_ID }} | ||
| run: Tools/gen_build_info.py | ||
|
|
||
| - name: Shuffle files around | ||
| run: | | ||
| mkdir "release/${{ github.sha }}" | ||
| mv release/*.zip "release/${{ github.sha }}" | ||
| - name: Upload files to mothership | ||
| uses: burnett01/[email protected] | ||
| with: | ||
| switches: -avzr --ignore-existing | ||
| path: "release/${{ github.sha }}" | ||
| remote_path: ${{ secrets.BUILDS_PATH }} | ||
| remote_host: ${{ secrets.BUILDS_HOST }} | ||
| remote_user: ${{ secrets.BUILDS_USERNAME }} | ||
| remote_key: ${{ secrets.BUILDS_SSH_KEY }} | ||
|
|
||
| - name: Update manifest JSON | ||
| uses: appleboy/ssh-action@master | ||
| - name: Upload build artifact | ||
| id: artifact-upload-step | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| host: ${{ secrets.BUILDS_HOST }} | ||
| username: ${{ secrets.BUILDS_USERNAME }} | ||
| key: ${{ secrets.BUILDS_SSH_KEY }} | ||
| script: node ~/scripts/push_to_manifest.js -fork ${{ vars.FORK_ID }} -id ${{ github.sha }} | ||
| name: build | ||
| path: release/*.zip | ||
| compression-level: 0 | ||
| retention-days: 0 | ||
|
|
||
| - name: Publish version | ||
| run: Tools/publish_github_artifact.py | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }} | ||
| ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }} | ||
| GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }} | ||
|
|
||
| # - name: Publish changelog (Discord) | ||
| # run: Tools/actions_changelogs_since_last_run.py | ||
|
|
@@ -99,3 +88,8 @@ jobs: | |
| # run: Tools/actions_changelog_rss.py | ||
| # env: | ||
| # CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }} | ||
|
|
||
| - uses: geekyeggo/delete-artifact@v5 | ||
| if: always() | ||
| with: | ||
| name: build | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <controls:BabyJailStatusWindow | ||
| xmlns="https://spacestation14.io" | ||
| xmlns:controls="clr-namespace:Content.Client.Administration.UI.Tabs.BabyJailTab" | ||
| Title="{Loc admin-ui-baby-jail-window-title}"> | ||
| <RichTextLabel Name="MessageLabel" Access="Public" /> | ||
| </controls:BabyJailStatusWindow> |
21 changes: 21 additions & 0 deletions
21
Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| using Content.Client.Message; | ||
| using Content.Client.UserInterface.Controls; | ||
| using Robust.Client.AutoGenerated; | ||
| using Robust.Client.UserInterface.CustomControls; | ||
| using Robust.Client.UserInterface.XAML; | ||
|
|
||
| namespace Content.Client.Administration.UI.Tabs.BabyJailTab; | ||
|
|
||
| /* | ||
| * TODO: Remove me once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future. | ||
| */ | ||
|
|
||
| [GenerateTypedNameReferences] | ||
| public sealed partial class BabyJailStatusWindow : FancyWindow | ||
| { | ||
| public BabyJailStatusWindow() | ||
| { | ||
| RobustXamlLoader.Load(this); | ||
| MessageLabel.SetMarkup(Loc.GetString("admin-ui-baby-jail-is-enabled")); | ||
| } | ||
| } |
26 changes: 26 additions & 0 deletions
26
Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <controls:BabyJailTab | ||
| xmlns="https://spacestation14.io" | ||
| xmlns:controls="clr-namespace:Content.Client.Administration.UI.Tabs.BabyJailTab" | ||
| xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls" | ||
| Margin="4"> | ||
| <BoxContainer Orientation="Vertical"> | ||
| <cc:CommandButton Name="EnabledButton" Command="babyjail" ToggleMode="True" | ||
| Text="{Loc admin-ui-baby-jail-disabled}" | ||
| ToolTip="{Loc admin-ui-baby-jail-tooltip}" /> | ||
| <cc:CommandButton Name="ShowReasonButton" Command="babyjail_show_reason" | ||
| ToggleMode="True" Text="{Loc admin-ui-baby-jail-show-reason}" | ||
| ToolTip="{Loc admin-ui-baby-jail-show-reason-tooltip}" /> | ||
| <BoxContainer Orientation="Vertical" Margin="0 10 0 0"> | ||
| <BoxContainer Orientation="Horizontal" Margin="2"> | ||
| <Label Text="{Loc admin-ui-baby-jail-max-account-age}" MinWidth="175" /> | ||
| <LineEdit Name="MaxAccountAge" MinWidth="50" Margin="0 0 5 0" /> | ||
| <Label Text="{Loc generic-minutes}" /> | ||
| </BoxContainer> | ||
| <BoxContainer Orientation="Horizontal" Margin="2"> | ||
| <Label Text="{Loc admin-ui-baby-jail-max-overall-minutes}" MinWidth="175" /> | ||
| <LineEdit Name="MaxOverallMinutes" MinWidth="50" Margin="0 0 5 0" /> | ||
| <Label Text="{Loc generic-minutes}" /> | ||
| </BoxContainer> | ||
| </BoxContainer> | ||
| </BoxContainer> | ||
| </controls:BabyJailTab> |
75 changes: 75 additions & 0 deletions
75
Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| using Content.Shared.Administration.Events; | ||
| using Robust.Client.AutoGenerated; | ||
| using Robust.Client.UserInterface; | ||
| using Robust.Client.UserInterface.XAML; | ||
| using Robust.Shared.Console; | ||
|
|
||
| /* | ||
| * TODO: Remove me once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future. | ||
| */ | ||
|
|
||
| namespace Content.Client.Administration.UI.Tabs.BabyJailTab; | ||
|
|
||
| [GenerateTypedNameReferences] | ||
| public sealed partial class BabyJailTab : Control | ||
| { | ||
| [Dependency] private readonly IConsoleHost _console = default!; | ||
|
|
||
| private string _maxAccountAge; | ||
| private string _maxOverallMinutes; | ||
|
|
||
| public BabyJailTab() | ||
| { | ||
| RobustXamlLoader.Load(this); | ||
| IoCManager.InjectDependencies(this); | ||
|
|
||
| MaxAccountAge.OnTextEntered += args => SendMaxAccountAge(args.Text); | ||
| MaxAccountAge.OnFocusExit += args => SendMaxAccountAge(args.Text); | ||
| _maxAccountAge = MaxAccountAge.Text; | ||
|
|
||
| MaxOverallMinutes.OnTextEntered += args => SendMaxOverallMinutes(args.Text); | ||
| MaxOverallMinutes.OnFocusExit += args => SendMaxOverallMinutes(args.Text); | ||
| _maxOverallMinutes = MaxOverallMinutes.Text; | ||
| } | ||
|
|
||
| private void SendMaxAccountAge(string text) | ||
| { | ||
| if (string.IsNullOrWhiteSpace(text) || | ||
| text == _maxAccountAge || | ||
| !int.TryParse(text, out var minutes)) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| _console.ExecuteCommand($"babyjail_max_account_age {minutes}"); | ||
| } | ||
|
|
||
| private void SendMaxOverallMinutes(string text) | ||
| { | ||
| if (string.IsNullOrWhiteSpace(text) || | ||
| text == _maxOverallMinutes || | ||
| !int.TryParse(text, out var minutes)) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| _console.ExecuteCommand($"babyjail_max_overall_minutes {minutes}"); | ||
| } | ||
|
|
||
| public void UpdateStatus(BabyJailStatus status) | ||
| { | ||
| EnabledButton.Pressed = status.Enabled; | ||
| EnabledButton.Text = Loc.GetString(status.Enabled | ||
| ? "admin-ui-baby-jail-enabled" | ||
| : "admin-ui-baby-jail-disabled" | ||
| ); | ||
| EnabledButton.ModulateSelfOverride = status.Enabled ? Color.Red : null; | ||
| ShowReasonButton.Pressed = status.ShowReason; | ||
|
|
||
| MaxAccountAge.Text = status.MaxAccountAgeMinutes.ToString(); | ||
| _maxAccountAge = MaxAccountAge.Text; | ||
|
|
||
| MaxOverallMinutes.Text = status.MaxOverallMinutes.ToString(); | ||
| _maxOverallMinutes = MaxOverallMinutes.Text; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| using Content.Shared.Clock; | ||
| using Robust.Client.GameObjects; | ||
|
|
||
| namespace Content.Client.Clock; | ||
|
|
||
| public sealed class ClockSystem : SharedClockSystem | ||
| { | ||
| public override void Update(float frameTime) | ||
| { | ||
| base.Update(frameTime); | ||
|
|
||
| var query = EntityQueryEnumerator<ClockComponent, SpriteComponent>(); | ||
| while (query.MoveNext(out var uid, out var comp, out var sprite)) | ||
| { | ||
| if (!sprite.LayerMapTryGet(ClockVisualLayers.HourHand, out var hourLayer) || | ||
| !sprite.LayerMapTryGet(ClockVisualLayers.MinuteHand, out var minuteLayer)) | ||
| continue; | ||
|
|
||
| var time = GetClockTime((uid, comp)); | ||
| var hourState = $"{comp.HoursBase}{time.Hours % 12}"; | ||
| var minuteState = $"{comp.MinutesBase}{time.Minutes / 5}"; | ||
| sprite.LayerSetState(hourLayer, hourState); | ||
| sprite.LayerSetState(minuteLayer, minuteState); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.