Upstream2107 (Требуется тестирование) #133

Schrodinger71 · 2024-07-21T09:11:47Z

Описание PR

Changelog.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: https://github.com/space-wizards/space-station-14/pull/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: https://github.com/space-wizards/space-station-14/pull/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: https://github.com/space-wizards/space-station-14/pull/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: https://github.com/space-wizards/space-station-14/pull/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: https://github.com/space-wizards/space-station-14/pull/29909
- author: jonathanargo
  changes:
  - message: Muskets are now wieldable.
    type: Tweak
  id: 6905
  time: '2024-07-12T09:16:21.0000000+00:00'
  url: https://github.com/space-wizards/space-station-14/pull/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: https://github.com/space-wizards/space-station-14/pull/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: https://github.com/space-wizards/space-station-14/pull/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: https://github.com/space-wizards/space-station-14/pull/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: https://github.com/space-wizards/space-station-14/pull/29935
- author: themias
  changes:
  - message: Timers can now be deconstructed
    type: Fix
  id: 6910
  time: '2024-07-12T11:38:59.0000000+00:00'
  url: https://github.com/space-wizards/space-station-14/pull/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: https://github.com/space-wizards/space-station-14/pull/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: https://github.com/space-wizards/space-station-14/pull/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: https://github.com/space-wizards/space-station-14/pull/29830
- author: EmoGarbage404
  changes:
  - message: Added wristwatches for telling time.
    type: Add
  id: 6914
  time: '2024-07-13T06:09:19.0000000+00:00'
  url: https://github.com/space-wizards/space-station-14/pull/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: https://github.com/space-wizards/space-station-14/pull/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: https://github.com/space-wizards/space-station-14/pull/29979

Admin.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: https://github.com/space-wizards/space-station-14/pull/29896

Проверки

PR полностью завершён и мне не нужна помощь чтобы его закончить.
Я внимательно просмотрел все свои изменения и багов в них не нашёл.
Я запускал локальный сервер со своими изменениями и всё протестировал.
Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

🆑 Шрёдька

tweak: Подтянуты изменения с корвакса, 21.07.24.

* Make VirtualItem not block attacking * Remove unneeded usings

* Revert "Revert Baby Jail (#29891)" This reverts commit 24a2866. * the fix

* Fix the ability to shoot out of crates * Makes it check what inventory the player is in * use IsEntityOrParentInContainer * Fix Issues Github had * gaahhh... Prevents lasers from being shot out of crates * gaahhh... Prevents lasers from being shot out of crates * Fix laser? * hmmm... this is better looking I think? * Uncook indentation * Rerun tests?

@Forcibly

* @Forcibly deadmins you * Added checks for AdminDeadminOnJoin

@deltanedas

* item toggle refactoring and some new systems * add ToggleClothing component/system * unhardcode magboots gravity logic * make magboots and speedboots use ItemToggle and stuff * remove now useless clothing components * update client/server magboots systems * add note to use ItemToggledEvent in ToggleActionEvent doc * refactor PowerCellDraw to use ItemToggle for ui open/close control * add TryUseCharges, refactor charges system * update magboot trigger code * make borg use ItemToggle, network SelectedModule instead of now removed Activated * add AccessToggle for borg * the giga ninja refactor * update ninja yml * update ItemToggle usage for some stuff * fix activatableui requires power * random fixing * yaml fixing * nuke ItemToggleDisarmMalus * make defib use ItemToggle * make things that use power not turn on if missing use charge * pro * fix sound prediction * bruh * proximity detector use ItemToggle * oop * big idiot syndrome * fix ninja spawn rule and make it generic * fix ninja spawn rule yml * move loading profiles into AntagLoadProfileRule * more ninja refactor * ninja yml fixes * the dreaded copy paste ops * remove useless NinjaRuleComponent and ue AntagSelection for greeting * fix invisibility * move IsCompleted to SharedObjectivesSystem * ability fixes * oop fix powercell instantly draining itself * sentient speedboots gaming * make reflect use ItemToggle * fix other test * loadprofilerule moved into its own pr * remove conflict with dragon refactor * remove all GenericAntag code from ninja * ) * probably * remove old enabled * great language bravo vince * GREAT LANGUAGE * who made this language * because it stinks * reparent blood-red magboots to magboots probbbly works * most of the review stuff * hasGrav doesnt mean what i thought it did * make health analyzer use itemtoggle, not fail test * fix mag/speed boots being wacky * UNTROLL * add ItemToggle to the random health analyzers * a * remove unused obsolete borg func * untrolling *

* fix test * fix * g * untroll --------- Co-authored-by: deltanedas <@deltanedas:kde.org>

Fix AtmosDeviceSystem debug assertion Heisenbug

…)" (#29901) This reverts commit 1a50760.

* Better admin note popup text visibility * Bring buttons closer to the border

* Update cluster evac * forgot tiny fans * the change

* Update FloorTileSystem to use EntityUid * missed a variable --------- Co-authored-by: plykiya <[email protected]>

* Made musket wieldable. * Updated musket rsi meta.json copyright. * Copyright adjustment again.

* make stun batons be thrown like a throwing weapon * stun prods too * pies too

Update RCDSystem.cs Co-authored-by: plykiya <[email protected]>

Update MapScreen.xaml.cs Co-authored-by: plykiya <[email protected]>

Update BiomeSystem.cs Co-authored-by: plykiya <[email protected]>

* Items droped in containers will end up in containers * Adds integration test for dropping entity while inside container * comment * comment * trim the diff --------- Co-authored-by: plykiya <[email protected]>

throwing system hotfix

Co-authored-by: Dimastra <[email protected]>

prevent people from breaking rules

…tion-14 into upstream2107

Schrodinger71 · 2024-07-21T09:22:00Z

Кайф, выскочили ошибки в системе с языками
хммм PowerCell

Error: /home/runner/work/space_station_ADT/space_station_ADT/Content.Server/ADT/Language/TranslatorSystem.cs(165,24): error CS1061: 'PowerCellSystem' does not contain a definition for 'SetPowerCellDrawEnabled' and no accessible extension method 'SetPowerCellDrawEnabled' accepting a first argument of type 'PowerCellSystem' could be found (are you missing a using directive or an assembly reference?) [/home/runner/work/space_station_ADT/space_station_ADT/Content.Server/Content.Server.csproj]
Error: /home/runner/work/space_station_ADT/space_station_ADT/Content.Server/ADT/Language/TranslatorSystem.cs(174,24): error CS1061: 'PowerCellSystem' does not contain a definition for 'SetPowerCellDrawEnabled' and no accessible extension method 'SetPowerCellDrawEnabled' accepting a first argument of type 'PowerCellSystem' could be found (are you missing a using directive or an assembly reference?) [/home/runner/work/space_station_ADT/space_station_ADT/Content.Server/Content.Server.csproj]
Error: /home/runner/work/space_station_ADT/space_station_ADT/Content.Server/ADT/Language/TranslatorSystem.cs(191,20): error CS1061: 'PowerCellSystem' does not contain a definition for 'SetPowerCellDrawEnabled' and no accessible extension method 'SetPowerCellDrawEnabled' accepting a first argument of type 'PowerCellSystem' could be found (are you missing a using directive or an assembly reference?) [/home/runner/work/space_station_ADT/space_station_ADT/Content.Server/Content.Server.csproj]

Меняем SetPowerCellDrawEnabled на новый метод SetDrawEnabled

Schrodinger71 · 2024-07-21T10:12:09Z

Хм, теперь такая

Starting test execution, please wait...
A total of 1 test files matched the specified pattern.
  Failed NoStaticPriceAndStackPrice [1 s]
  Error Message:
   Multiple failures or warnings in test:
  1) SERVER: 1,481s [ERRO] system.item_toggle: Can't resolve "Content.Shared.Item.ItemToggle.Components.ItemToggleComponent" on entity переводчик вульпканинов (11799/n11799, VulpTranslator)!
   at System.Environment.get_StackTrace()
   at Content.Shared.Item.ItemToggle.ItemToggleSystem.TryDeactivate(Entity`1 ent, Nullable`1 user, Boolean predicted) in /home/runner/work/space_station_ADT/space_station_ADT/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs:line [13](https://github.com/AdventureTimeSS14/space_station_ADT/actions/runs/10027377105/job/27712969172?pr=133#step:10:14)8
   at Content.Server.PowerCell.PowerCellSystem.OnDrawCellChanged(EntityUid uid, PowerCellDrawComponent component, PowerCellChangedEvent args) in /home/runner/work/space_station_ADT/space_station_ADT/Content.Server/PowerCell/PowerCellSystem.Draw.cs:line 63

Schrodinger71 · 2024-07-21T10:40:14Z

Надо всё проверить, тесты прошли

Schrodinger71 · 2024-07-26T19:53:16Z

ну и с хера

Schrodinger71 · 2024-07-26T20:30:39Z

Жесть

ShadowCommander and others added 30 commits July 11, 2024 14:48

Allow attack while pulling (#29703)

4d4f671

* Make VirtualItem not block attacking * Remove unneeded usings

Automatic changelog update

e01af4d

Fix baby jail (#29896)

6371a04

* Revert "Revert Baby Jail (#29891)" This reverts commit 24a2866. * the fix

Automatic changelog update

3ebfe46

Glass Airlocks In Spray Painter (#29869)

eae0412

Automatic changelog update

1ea7e3e

Picking a ghostrole as an admin will now deadmin you. (#29790)

1a50760

* @Forcibly deadmins you * Added checks for AdminDeadminOnJoin

Automatic changelog update

e45f55e

Fix AtmosDeviceSystem debug assert Heisenbug (#29752)

e6f55fa

Fix AtmosDeviceSystem debug assertion Heisenbug

Revert "Picking a ghostrole as an admin will now deadmin you. (#29790…

03f0257

…)" (#29901) This reverts commit 1a50760.

Аnnouncement sender localization (#29907)

9a17154

Better admin note popups text visibility (#29909)

bb67364

* Better admin note popup text visibility * Bring buttons closer to the border

Automatic changelog update

8fd35e8

Update cluster evac (#29885)

e3bb277

* Update cluster evac * forgot tiny fans * the change

Update FloorTileSystem to not use Component.Owner() (#29930)

4945e6a

* Update FloorTileSystem to use EntityUid * missed a variable --------- Co-authored-by: plykiya <[email protected]>

Made musket wieldable. (#29910)

00a2c6a

* Made musket wieldable. * Updated musket rsi meta.json copyright. * Copyright adjustment again.

Automatic changelog update

cd90b41

Allow notice boards to be built on walls (#29851)

3a9b1ea

Make stun batons be thrown like a throwing weapon (#29883)

f125dda

* make stun batons be thrown like a throwing weapon * stun prods too * pies too

Automatic changelog update

00ec83a

Update RCDSystem.cs to not use Component.Owner (#29940)

65ccd6e

Update RCDSystem.cs Co-authored-by: plykiya <[email protected]>

Update MapScreen.xaml.cs to not use Component.Owner (#29938)

b6672f0

Update MapScreen.xaml.cs Co-authored-by: plykiya <[email protected]>

Update BiomeSystem.cs to not use Component.Owner (#29939)

160364e

Update BiomeSystem.cs Co-authored-by: plykiya <[email protected]>

Fixes dropping item in container (#29900)

a8cae6f

* Items droped in containers will end up in containers * Adds integration test for dropping entity while inside container * comment * comment * trim the diff --------- Co-authored-by: plykiya <[email protected]>

Localization of dungeon direction (#29911)

f53d014

Automatic changelog update

b5e49c9

Throwing system hotfix (#29935)

560df6e

throwing system hotfix

Automatic changelog update

caf8776

meowstushka and others added 7 commits July 18, 2024 00:43

[Maps] Delta Tweak (#2400)

b3c1cbb

[Maps] Delta Small Tweak (#2422)

ced4197

Fix book sprite (#2421)

d16a23a

Co-authored-by: Dimastra <[email protected]>

Move lore books text to ftl (#2416)

84e265b

Remove some names from datasets (#2020)

51e825b

prevent people from breaking rules

[Maps] New terminal (#2423)

113aacc

Merge branch 'master' of https://github.com/space-syndicate/space-sta…

3fa7369

…tion-14 into upstream2107

Schrodinger71 self-assigned this Jul 21, 2024

github-actions bot added Changes: UI Изменение интерфейса Changes: Sprites Изменение спрайтов Changes: Map Изменение карт Changes: Localization Изменение локализации labels Jul 21, 2024

Фикс TranslatorSystem

51059ac

Меняем SetPowerCellDrawEnabled на новый метод SetDrawEnabled

Schrodinger71 added the Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ label Jul 21, 2024

Fix YAml Linter?

22ec224

Schrodinger71 changed the title ~~Upstream2107~~ Upstream2107 (Требуется тестирование) Jul 21, 2024

Merge branch 'master' into upstream2107

c5aa062

Schrodinger71 added 2 commits July 26, 2024 23:04

Fix YAml Linter

9ed5aa9

maybe Fix

cf8279f

Schrodinger71 enabled auto-merge July 26, 2024 20:47

Schrodinger71 disabled auto-merge July 26, 2024 23:38

Schrodinger71 merged commit 48402eb into master Jul 26, 2024
11 checks passed

Schrodinger71 deleted the upstream2107 branch July 26, 2024 23:39

Schrodinger71 removed the Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ label Jul 27, 2024

Schrodinger71 removed their assignment Jul 27, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upstream2107 (Требуется тестирование) #133

Upstream2107 (Требуется тестирование) #133

Schrodinger71 commented Jul 21, 2024 •

edited

Loading

Schrodinger71 commented Jul 21, 2024 •

edited

Loading

Schrodinger71 commented Jul 21, 2024

Schrodinger71 commented Jul 21, 2024 •

edited

Loading

Schrodinger71 commented Jul 26, 2024

Schrodinger71 commented Jul 26, 2024

Upstream2107 (Требуется тестирование) #133

Upstream2107 (Требуется тестирование) #133

Conversation

Schrodinger71 commented Jul 21, 2024 • edited Loading

Описание PR

Changelog.yml

Admin.yml

Schrodinger71 commented Jul 21, 2024 • edited Loading

Schrodinger71 commented Jul 21, 2024

Schrodinger71 commented Jul 21, 2024 • edited Loading

Schrodinger71 commented Jul 26, 2024

Schrodinger71 commented Jul 26, 2024

Schrodinger71 commented Jul 21, 2024 •

edited

Loading

Schrodinger71 commented Jul 21, 2024 •

edited

Loading

Schrodinger71 commented Jul 21, 2024 •

edited

Loading