Commit graph

4957 commits

Author SHA1 Message Date
Vigers Ray
fffada0d68 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Client/Launcher/LauncherConnectingGui.xaml
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs
#	Content.Server/Cargo/Components/StationBankAccountComponent.cs
#	Content.Server/Cargo/Systems/CargoSystem.Orders.cs
#	Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
#	Content.Shared/Weapons/Reflect/ReflectSystem.cs
#	Resources/Locale/en-US/_strings/cargo/cargo-accounts.ftl
2025-04-13 17:18:35 +03:00
Nemanja
12b75beeab
Departmental Economy (#36445)
* Cargo Accounts, Request Consoles, and lock boxes

* Funding Allocation Computer

* final changes

* test fix

* remove dumb code

* ScarKy0 review

* first cour

* second cour

* Update machines.yml

* review

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-13 15:22:36 +02:00
Ed
5f78b72763
ParallaxControl UI Dehardcode (#36071)
* Parallax Control Improve

* Update MainMenuControl.xaml

* PJBControl.cs
2025-04-13 22:44:44 +10:00
metalgearsloth
83aaa73f0e
Fix docks clipping on shuttle nav (#36348)
* Fix docks clipping on shuttle nav

UI scale casualty.

* review
2025-04-13 16:29:05 +10:00
Vigers Ray
c409ebb7b4 Merge remote-tracking branch 'space-wizards/master' 2025-04-13 02:51:42 +03:00
Errant
0c6e21dec2
PlayerPanel Follow button (#36466)
* Follow button

* remove event stuff
2025-04-12 22:00:46 +02:00
Vigers Ray
182415446a Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Resources/Locale/en-US/_strings/mind/verbs/inspect-mind.ftl
2025-04-12 23:00:43 +03:00
slarticodefast
fca83f9924
add debug verb for inspecting mind entities (#36474)
* mind verb

* new line
2025-04-12 15:37:07 +02:00
Vigers Ray
2c1db3ffdf
Анализатор растений (#1755)
Co-authored-by: Ignaz Kraft <ignaz.k@live.de>
2025-04-12 04:05:07 +03:00
Vigers Ray
d92d143236 Merge remote-tracking branch 'space-wizards/master' 2025-04-12 00:57:03 +03:00
Vigers Ray
62eabda73c фиксы ахелпа 2025-04-12 00:52:19 +03:00
Pieter-Jan Briers
e6e60dead4
Revert "Feature/shader radial menu" due to shader issue (#36470) 2025-04-11 23:30:52 +02:00
Errant
4ecdc17bb8
PlayerPanel username copy fix (#36468)
weh
2025-04-11 23:04:37 +02:00
Vigers Ray
022d9ddd1b Merge remote-tracking branch 'space-wizards/master' 2025-04-11 18:58:41 +03:00
lunarcomets
fd7413f51a
predict borg selection (#36430)
do the thing
2025-04-11 14:17:11 +02:00
Nemanja
1540880eb2
Predict Labels (#36406)
* Predict Labels

* nitpicks
2025-04-10 22:19:48 -07:00
Vigers Ray
8440e2bd76 Убрал у FootprintComponent AutoGenerateComponentState 2025-04-11 05:24:51 +03:00
Vigers Ray
13193b095a Removes the option for players to disable recoil their own recoil. (#5220) 2025-04-11 04:59:11 +03:00
Vigers Ray
812815ac1d Revert "Add undergarments & "Censor Nudity" toggle to options (#33185)"
This reverts commit 27cfc093
2025-04-11 04:57:06 +03:00
Vigers Ray
fb40dab956 Фиксы сохранения ахелпов в БД 2025-04-11 00:58:32 +03:00
Vigers Ray
a136c69a08 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Client/Humanoid/MarkingPicker.xaml.cs
#	Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
#	Resources/Prototypes/Shaders/shaders.yml
2025-04-10 16:34:22 +03:00
Pieter-Jan Briers
25b620de23
Lower minimum size of absorbent item status (#35804)
80f2dc6dd3 fixed BoxContainer so that the actual specified MinimumSize gets used. This is a problem because for the absorbent item status it's way too high so it looks silly.
2025-04-10 20:48:13 +10:00
J
3c307f3b36
Various UI warnings cleanup (#36169)
* Various UI warnings cleanup

* Revert unnecessary change

* Redoing SpriteSystem as it's non-injectable

* Missed one

* Better entity instantiation

* General cleanup of warnings changes

* Wrong class name!
2025-04-10 20:47:05 +10:00
Fildrance
56710697a9
Feature/shader radial menu (#35152)
* it works! kinda

* so it works now

* minor cleanup

* central button now is useful too

* more cleanup

* minor cleanup

* more cleanup

* refactor: migrated code from toolbox (as it was rejected as too specific)

* feat: moved border drawing for radial menu into RadialMenuTextureButton. Radial menu position setting into was moved to OverrideArrange to not being called on every frame

* refactor: major reworks!

* renamed DrawBagleSector to DrawAnnulusSector

* Remove strange indexing

* Regularize math

* refactor: re-orienting segment elements to be Y-mirrored

* refactor: extracted radial menu radius multiplier property, changed color pallet for radial menu button

* refactor: removed icon backgrounds on textures used in current radial menu buttons with sectors, RadialContainer Radius renamed and now actually changed control radius.

* refactor: in RadialMenuTextureButtonWithSector all sector colors are converted to and from sRGB in property getter-setters

* refactor: renamed srgb to include Srgb suffix so devs gonna see that its srgb clearly

* fix: enabled any functional keys pressed when pushing radial menu buttons

* fix: radial menu sector now scales with UIScale

* fix: accept only one event when clicking on radial menu ContextualButton

* fix: now radial menu buttons accepts only click/alt-click, now clicks outside menu closes menu always

* feat: simple radial menu prototype for easier creation

* refactor: cleanup, restored emote filtering, button models now have class hierarchy

* refactor: remove usage of closure from 'outside code'

* refactor: remove non existing type from UiControlTest

* refactor: remove unused using

* refactor: revert ability to declare radial menu layers in xaml, scale 32px sprites using scale in radial menu

* refactor: whitespaces

* refactor: subscribe for dispose on existing radial menus

* feat: now simple radial menu button models can have custom color for each sector background (and hover background color). Also added OpenOverMouseScreenPosition inside SimpleRadialMenu

* fix: AI door menu now can be closed by verb if it gets unpowered

* overlay and its registration

* radial menu shader but it requires wierd offset

* remove unused file

* smol cleanup

* remove unused code

* neat internal subsctors in radial menu shaders

* refactor finalize visual style

* comments, simplify, extract variable and other minor refactors on radial-menu shader

* refactor: extract more data from radial menu with sector to radial container for shader drawing

* replaced DrawSeparators for RadialMenuTextureButtonWithSector with DrawBorder (no reason to make them separate), also now colors are properly applied

* refactor: simplify hiding border, extended xml-doc for simple radial menu settings

* refactor: remove duplication of radial menu shaders, use ValueList to collect ClearExistingChildrenRadialButtons buttons to remove

* refactor: remove linq

* fix: fix AI radial action serialization using invalid type

* refactor: fix duplicate ShowDeviceNotRespondingPopup for AI by properly checking if it can interact

* refactor: removed *if* blocks from shader, replaced with branchless logic

* refactor: whitespaces, changed list to array in simple radial button preparing methods

* fix: merge duplicated code

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2025-04-10 20:42:53 +10:00
Vigers Ray
e4cccaa553 Merge remote-tracking branch 'origin/master' 2025-04-09 21:14:21 +03:00
Vigers Ray
789564090b Возможный фикс спама в логи футпринтами 2025-04-09 21:12:25 +03:00
Kot
bb9d23d3bf
Move SolutionRegenerationSwitcherSystem to Shared (#1700) 2025-04-09 20:35:38 +03:00
Vigers Ray
22cf3a0317 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Resources/Locale/en-US/_strings/objectives/commands/rmobjective.ftl
#	Resources/Textures/Objects/Misc/brbsign.rsi/meta.json
2025-04-09 18:04:28 +03:00
Whatstone
e6ea77d21b
DocumentParsingManager: Ignore XML comments in guidebook pages (#35506)
* Parse XML comments

* Use var instead of typed for variable declaration

---------

Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
2025-04-08 14:44:55 +02:00
Vigers Ray
b619ca174a Ахелпы сохраняются в базе данных 2025-04-08 05:09:44 +03:00
Vigers Ray
23284710b2 Merge remote-tracking branch 'space-wizards/master' 2025-04-07 13:28:57 +03:00
slarticodefast
50bbb1c101
predict IgnitionSourceComponent (#36310)
* PREDICTION

* comment

* don't overwrite event args

* totally not a web edit

* intn't
2025-04-06 17:54:47 -07:00
Vigers Ray
0901aa9c72 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Server/Chat/SuicideSystem.cs
#	Content.Server/Ghost/GhostSystem.cs
#	Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
#	Content.Shared/Standing/StandingStateSystem.cs
#	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Prototypes/Roles/Antags/revolutionary.yml
#	Resources/Prototypes/Roles/Antags/thief.yml
#	Resources/Prototypes/Roles/Antags/traitor.yml
#	Resources/Prototypes/Roles/Antags/zombie.yml
#	Resources/Prototypes/Roles/Jobs/CentComm/official.yml
2025-04-06 04:22:26 +03:00
Vigers Ray
0e043b2a67 фикс OOC чата для админов 2025-04-06 01:59:18 +03:00
J
af9526197a
Extracts magic strings from Tag calls (#36305)
* Extracts magic strings from Tag calls

When #36281 gets merged, the `TagSystem` methods will all give warnings. Let's fix those warnings before they even happen!

* Adds missing libraries

* Remove not yet implemented TagSystem changes

* Fix tag spelling error

Genuinely surprised there was only 1!

* Styling and proper type changes

* Styling

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2025-04-04 20:20:19 -04:00
metalgearsloth
593804b517
Mob collisions (#34580)
* Conveyor optimisations

- Optimise movement for moving stuff. Better flags + less resolves + slapped parallelrobustjob on it.
- Sleeping for entities getting conveyed into walls.

* Blocker version

* Finish

* Final

* Mob collisions

* impulses

* Collision smoothing

* Locked in

* 30tps working

* r

* fixes

* Best

* Fixes + CVars

* CVars in place

* Pushies

* Opt attempt 1

* Revert "Opt attempt 1"

This reverts commit 5ccd72dcbea09261a992aa1f7f05df169a1ce676.

* Fix mispredicts

* Ready-ish

* better

* Cleanup

* Fix conveyor power mispredict

* Forgetting to actually do deltas

* Fix buckle pushes

* Bagel save

* Revert "Bagel save"

This reverts commit 1b93fda81fb852d89b89b0beae0b80f8a61165f2.

* Conveyor resave

* Fix prediction

* Mob movement rewrite

* Bandaid

* Working version

* Tentatively working

* Friction to fix cornering

* More fixes

* Revert bagel

* Revert this

* Bad parity

* Working

* Fixes

* Woops

* Doc comments

* Pen cap cvar

* StandingState cleanup and sub

* Fix downed mobs

* fish

* client

* Disable pushing on tests

* More variables

* Movement mods

* Mass diff

* 1 more tweak

* Cvar
2025-04-05 00:33:52 +11:00
Babaev
2df43d876c
Отключение звука новых ролей (#1658) 2025-04-04 12:38:31 +03:00
Vigers Ray
289ad00d9a Merge remote-tracking branch 'space-wizards/master' 2025-04-03 19:42:17 +03:00
pathetic meowmeow
e9b89a1c6b
Improve sprite fading behaviour (#35863)
* Click through faded sprites

* Count the mouse position for which sprites to fade
2025-04-03 09:58:05 +03:00
Vigers Ray
099a74bcdc Merge remote-tracking branch 'space-wizards/master' 2025-04-03 07:20:43 +03:00
Tayrtahn
e4d7f164f6
Localize air alarm states (#36266) 2025-04-02 19:38:26 -07:00
Vigers Ray
a5d141e7e5 Фикс регулировки музыки голосования (блядь, это же кринж, почему я блядь не сделаю это просто через ентити систем) 2025-04-03 05:11:18 +03:00
Vigers Ray
abca732f32 фикс апстрима 2025-04-03 03:17:38 +03:00
Vigers Ray
3ca70f5dc8 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Client/Chat/UI/EmotesMenu.xaml.cs
#	Content.Client/UserInterface/Controls/RadialMenu.cs
#	Content.Client/UserInterface/Systems/Emotes/EmotesUIController.cs
#	Content.Server/Zombies/ZombieSystem.Transform.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
#	Resources/ServerInfo/Guidebook/Security/Security.xml
2025-04-03 00:33:21 +03:00
banumbas
57578360e5
Реворк сварочной маски. Порт PR визардов 31999 (#1623) 2025-04-03 00:10:28 +03:00
Vigers Ray
915e4a8897 ы 2025-04-03 00:08:13 +03:00
Vigers Ray
100c44d16f Выключение музыки голосования и выключение звука прыжка по дефолту 2025-04-02 21:50:25 +03:00
J
3192a7fde5
Rotation warnings cleanup (#36197)
* Rotation warnings cleanup

* Naming convention fix

* Adding component that we already have
2025-04-01 23:56:37 +02:00
Tayrtahn
c8fe3651e5
Add prediction to electric grills (#36241)
* Prediction for EntityHeaterSystem

* Switch to Entity<T>

* meh

* Move popup inside ChangeSetting

* Fix grill visually turning on when changing setting while power is off

* Add note about my failed quest

* Why isn't this an IDE warning?

* Move comment above switch expression in SettingPower
2025-04-01 09:43:19 -07:00
J
3c3cf1d867
Light warnings cleanup (#36195)
* Light warnings cleanup

* Using EntitySystem Proxy overrides

* New TryComp guards for light animations

* Reverting guards when not wanted
2025-03-31 20:25:00 +02:00