Commit graph

4263 commits

Author SHA1 Message Date
VigersRay
0a00a10776 Аудиозаписи в радио чате теперь воспроизводятся в очереди. 2024-07-25 00:51:00 +03:00
VigersRay
31b256cce8 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Entities/Mobs/Species/moth.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
#	Resources/Prototypes/Traits/disabilities.yml
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json
#	Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json
2024-07-24 20:36:22 +03:00
Ed
918709cb47
Displacement maps big update (#30093)
* split logic into own system

* add support for different size displacement maps

* some clothes may not use displacement maps

* displacement maps spport hand sprites

* Update DisplacementMapSystem.cs

* rename things

* fuck stencilmask

* fix bugs

* no masks

* Update jumpsuits.yml

* fix species specific sprites

* Update ClothingSystem.cs

* shoes + ears displacement, some bugfix

* Update DisplacementMapSystem.cs
2024-07-23 12:04:09 +03:00
Plykiya
851a0e15a7
fix crayon (#30263)
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-23 12:22:59 +10:00
Errant
bf1450fdc8
Fix replayghost spawning location (#30252)
Fix replayghost spawn
2024-07-22 20:32:30 +01:00
VigersRay
0a408dece4 фиксы апстрима 2024-07-22 04:38:50 +03:00
VigersRay
d2c1a1df88 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
#	Content.Client/Power/PowerMonitoringWindow.xaml.cs
#	Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
#	Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/Ghost/Roles/GhostRoleSystem.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
#	Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
#	Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
#	Resources/Textures/Structures/Walls/mining.rsi/meta.json
2024-07-22 04:16:05 +03:00
VigersRay
21fbd92f03 Обновил апишки 2024-07-22 04:07:51 +03:00
Plykiya
aded74a88a
Syndicate Reinforcement Specializations: Medic, Spy, Thief (#29853)
* Syndicate thief, spy, medic

* Fixes description for nukies

* update description for uplink

* Implement the radial menu

* forgot these were necessary to push lol

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-21 20:32:25 +10:00
metalgearsloth
e77ebaf325
Fix war declarator (#30221) 2024-07-21 17:17:59 +10:00
metalgearsloth
b41c6a28fe
Reset ghost role menu scroll upon search (#30159)
Quality of life so it doesn't sit on your old spot anymore.
2024-07-21 02:38:45 -04:00
metalgearsloth
aca878c9f7
Set input coords to invalid if mouse off-screen (#30164)
This may be a breaking change for some stuff, I only tested basic combat stuff + throwing.

This fixes the coordinates setting an off-screen position to the top-left pixel and blocks throw attempts as a result.
2024-07-21 02:13:28 -04:00
metalgearsloth
b4ec629b9f
Fix muzzle flash tracking (#30163)
* Fix muzzle flash tracking

User was never set on the networked event but we don't really need it anyway.

* Also this one
2024-07-21 02:09:16 -04:00
Crude Oil
6c6ae35cf8
Add ability to show stack visuals on closed containers (#29309)
* add ability to show stack visuals on closed containers

* remove container stack visuals logic from sharedstoragesystem

* improve comments a bit

* move logic for open/closed containers into itemcountersystem

* move behavior to storage component

* remove unused import

* remove old comment

* fix comments

* fix wrong property name

* Update Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs

* Rename variable for clarity

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-07-20 22:49:48 -07:00
Nemanja
0b5fe2a9ac
PA ui cleanup + bugfixes (#28750)
* ui and visual aspect + radio

* finish jank ui shit and finish radio

* remove radio

* send it

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-07-21 15:27:18 +10:00
metalgearsloth
edb05e36bb
Reapply "Remove some BUI boilerplate" (#30214) (#30219)
* Reapply "Remove some BUI boilerplate" (#30214)

This reverts commit cb0ba66be3.

* Fix gas tank

* Fix PA

* Fix microwave

* Comms console underwrap

* Fix rcd

* log wehs
2024-07-21 14:48:13 +10:00
Nemanja
cb0ba66be3
Revert "Remove some BUI boilerplate" (#30214)
Revert "Remove some BUI boilerplate (#28399)"

This reverts commit cbf329a82d.
2024-07-20 20:42:27 -04:00
metalgearsloth
cbf329a82d
Remove some BUI boilerplate (#28399)
* Remove some BUI boilerplate

- The disposals overrides got removed due to the helper method handling it.
- Replace window creation with CreateWindow helper.
- Fixed some stinky code which would cause exceptions.

* More

* moar

* weh

* done

* More BUIs

* More updates

* weh

* moar

* look who it is

* weh

* merge

* weh

* fixes
2024-07-20 15:40:16 +10:00
eoineoineoin
1783e0e4c2
Add a background for OptionsButton popup (#29792)
Add a reasonable background for OptionsButton popup

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-07-20 13:54:36 +10:00
CaasGit
b04f98513c
fix(FaxVisualsSystem): Fax can Play() when a anim key has been added. (#30013)
Adds a check to see if a faxecute animation is being played before
playing another animation. The old code can thrown an exception which
I've seen on live while ghosting.
2024-07-20 13:36:22 +10:00
DrSmugleaf
78f3ffc2a4
Make ActionsSystem.UpdateAction public (#30056) 2024-07-19 23:03:43 -04:00
themias
5dfca4c2dc
Fix mailing unit UI (#30174) 2024-07-20 12:31:26 +10:00
DakotaGay
f2b9cd7a25
Fix Markup Tags in Station News (#30169)
* Fix (hopefully)

* Fixed Spelling Mistake and minor Code Cleanup

* Revert "Fixed Spelling Mistake and minor Code Cleanup" due to Pull Request Guidelines

This reverts commit cee3e0226b349187bd8fd8b639e161fb877e8bdb.
2024-07-19 10:18:39 -04:00
Ed
d6e0114126
randomize iconSmoothing (#28158)
* randomize iconSmoothing

* Revert "randomize iconSmoothing"

This reverts commit 094356f975737c0af24ce39d849aec7852b9af6e.

* try 2

* trying work with client-server communication

* still dont work

* Tayrtahn good suggestion

* remove outdated code

* Fix!

* move data to Appearance

* Update RandomIconSmoothComponent.cs
2024-07-19 18:13:35 +10:00
Cojoke
b57174007c
Remove all Assigned Values that are Never Used (#30110)
Remove all Assigned Values that are never used
2024-07-18 20:22:23 -04:00
VigersRay
a8e5e66277 Апстрим 2024-07-18 17:07:25 +03:00
Ed
d8ab4982ad
Character menu issuer localization (#29840)
* Update CharacterUIController.cs

* TODO Burn this shit

* huh?

* huh!

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-07-17 08:47:50 +03:00
VigersRay
b390abe77c Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-16 14:00:27 +03:00
Simon
b35539db4a
Fix some markup related obsolete warnings in research and anomaly related systems (#30072)
Fix some Markup related obsolete warnings in Research and Anomaly related systems
2024-07-15 22:14:37 +03:00
VigersRay
a3e61685c8 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-15 18:04:05 +03:00
Pieter-Jan Briers
c0593fb328
Fix invalid UI hover/click sounds breaking client (#30067)
fixes #29561
2024-07-15 16:55:05 +02:00
pacable
31aa79a1dd
Изменение имени сервера в лобби (#198)
* кд на баны 15 секунд

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

* теперь сервер в лобби можно настроить через cvar

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
2024-07-15 01:26:59 +03:00
VigersRay
fe8edf03d4 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
2024-07-15 01:24:12 +03:00
VigersRay
5fed5ad979 Куча разного говна которое давно должно было в билде. 2024-07-15 01:22:56 +03:00
Pieter-Jan Briers
b7d3964c56
Fix AccessLevelControl breaking (#30045)
#29987 did an oopsie

This broke the ID computer, station records, and maybe some others too.
2024-07-15 00:07:48 +02:00
Ed
1c74ffb8e4
Ambient music rules refactor (#29921)
* refactor

* dutypo
2024-07-14 23:58:48 +10:00
VigersRay
c292c6e0a2 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-14 13:26:05 +03:00
Winkarst
960cc806cc
Update AccessLevelControl.xaml.cs to use ISawmill (#29987)
* Update AccessLevelControl.xaml.cs to use ISawmill

* Update

* Silly me

* Update
2024-07-14 20:24:26 +10:00
VigersRay
5aaf638614 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Tools/gen_build_info.py
2024-07-14 12:24:06 +03:00
Winkarst
5d1702d280
Update MainMenu.cs to use ISawmill (#29988)
* Update MainMenu.cs to use ISawmill

* Update

* Error
2024-07-14 13:05:39 +10:00
Plykiya
b7aa97e203
Replace obsolete EntityCoordiates.InRange() with TransformSystem.InRange() (#29993)
* Replace EntityCoordiates.InRange() with TransformSystem.InRange()

* nullspace

* I figured it out

* man I have no clue how client side sutff works

* please have mercy

* remove RadiationPulseOverlay changes

* nullspace

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-13 23:25:51 +02:00
Plykiya
a03b88979e
Replace obsolete xform.ToMap() with xformSystem.ToMapCoordinates() (#30010)
* Get rid of a bunch of obsolete usages

* position

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-13 23:05:22 +02:00
Winkarst
bf4ef62ab3
Update RadiationPulseOverlay.cs to have 0 warnings (#30004) 2024-07-13 18:45:34 +02:00
VigersRay
506346f6c1 упс 2024-07-13 17:25:03 +03:00
VigersRay
2d61b8cc3c Динамический чейнжлог, выключение хаба серверов 2024-07-13 17:20:44 +03:00
VigersRay
a21b422dac Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-13 16:23:23 +03:00
Plykiya
6c1d1057d5
Replace DetachParentToNull() with DetachEntity() (#29992)
DETACH PARENT TO ENTITY

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-13 20:59:33 +10:00
VigersRay
83090d089f Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png
2024-07-13 12:55:55 +03:00
CaasGit
ac768fe9f1
fix(SharedGunSystem): Return and debug log on CreateEffect. (#29656)
Sometimes CreateEffect is called on a Invalid Entity. This now causes
that to check, thus returning out and printing some hopefully helpful
logs to try to track down the real source of this issue.
2024-07-13 16:12:57 +10:00
slarticodefast
eb4ce85354
Remove imagesharp and StatusEffectAddedEvent from FlashOverlay (#28930)
remove imagesharp and StatusEffectAddedEvent from FlashOverlay
2024-07-13 16:10:04 +10:00