Commit graph

4625 commits

Author SHA1 Message Date
Vigers Ray
6f1366814f Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
2024-12-14 21:22:31 +03:00
Southbridge
7eb714d38f
Monospace Support for Rich Text (#33830)
* Initial Commit

* Moved all this to SS14 on it's own

* Added prototype validation
2024-12-13 15:24:34 +01:00
Vigers Ray
da19a63c83 Фикс спавна за нежелаемые роли 2024-12-13 03:36:48 +03:00
Vigers Ray
7c376e48f1 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
2024-12-12 02:27:31 +03:00
Vigers Ray
f3c8dbf9b7 Убрал возможность по мете использовать призрака. 2024-12-12 02:24:54 +03:00
BramvanZijp
ce9fc82382
Rework the HoS's Energy Shotgun (Varying energy consumption depending on fire-mode + re-adds a toned down self recharge.) (#32104)
* Rebalance HoS's Energy Shotgun

* SLIGHTLY Up the max charge so the gun properly recharges all of its charges, which matters a lot more with the self charge cooldown system.

* Prevent recharge cooldown if 0 power is used.

* Makes the clientside HUD actually update to reflect the changes in firecost and thus max/current charges.

* Properly fix that recharging to just under full issue instead of applying a budget fix to only the eshotgun.

* Clean up the client ammo UI fix.

* Update the self recharger component to comply with maintainer request.

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Remove code that was made redundant by a hotfix from another PR.

* Make the recharge pause on EMP, document things where needed, clean up code as per maintainer request, add a note to make the code better when power is moved to shared.

* Fix another internal issue

* Code cleanup + fix the rapid recharge verb to remove pause.

* cleanup

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-12-11 17:21:04 +01:00
Vigers Ray
1bcfa3af91 Фикс рендера трассеров с тикрейтом ниже 25 2024-12-11 18:51:29 +03:00
Vigers Ray
46d1ed8cc6 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	.github/labeler.yml
#	Content.Client/Lobby/LobbyUIController.cs
#	Resources/Locale/en-US/_strings/movement/pulling.ftl
2024-12-09 23:32:58 +03:00
Odleer
c195c9567e
БЗ и хилиум (#808)
* Готово

* Подправил цены

* Мини фикс

* Упростил
2024-12-09 22:07:58 +03:00
deathride58
5ab8e467a5
Adds an introductory message to the user-facing ahelp chat window (#33348)
* Adds an introductory message to the user-facing ahelp chat window

* Update Resources/Locale/en-US/administration/bwoink.ftl

* Update Resources/Locale/en-US/administration/bwoink.ftl

---------

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
2024-12-09 09:54:23 +01:00
Errant
0c4dd9d1b9
Revert "Simplify separated screen top menu (#33047)" (Stable -> Master) (#33785) 2024-12-08 22:14:34 +01:00
Vasilis The Pikachu
8472603b76
Revert "Simplify separated screen top menu (#33047)"
This reverts commit f27fa1ed30.
2024-12-08 21:36:48 +01:00
Pieter-Jan Briers
299b13f21b
Give silicons proper lobby/character editor previews (#33763)
* Give silicons proper lobby/character editor previews

No more naked dummies, properly show a borg/AI sprite now.

This means taking the JobEntity into account when spawning the dummy. For AIs I had to add a "JobPreviewEntity" field because they'd look like a posibrain otherwise. AI therefore uses a custom dummy entity I defined.

Also I had to add some margins to the UI, because otherwise the 32x32 sprite of the AI would look bad.

* Update Content.Shared/Roles/JobPrototype.cs

* Update Content.Client/Lobby/LobbyUIController.cs

* Update Resources/Prototypes/Entities/Mobs/Player/silicon.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-08 02:46:41 +01:00
SpaceManiac
20be8298b7
Organize the Sandbox Panel window (#33684)
* Organize Sandbox Panel

* Map Editing -> Editing

* Unset ToggleMode on Suicide button. Can hardly un-suicide, no?

* Remove 'Link machines' button that has done nothing for 3 years

* Remember Sandbox window's position instead of forcing to center

* Shows Spawns -> Show Spawns

* Remove SandboxSystem.MachineLinking
2024-12-07 19:13:56 +01:00
Vigers Ray
e24b72018f Ой, бесконечные патроны. 2024-12-07 08:23:03 +03:00
Vigers Ray
bcd534952f Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Datasets/Names/ai.yml
#	Resources/Prototypes/Datasets/Names/arachnid_first.yml
#	Resources/Prototypes/Datasets/Names/diona.yml
#	Resources/Prototypes/Datasets/Names/fake_human_first.yml
#	Resources/Prototypes/Datasets/Names/fake_human_last.yml
#	Resources/Prototypes/Datasets/Names/last.yml
#	Resources/Prototypes/Datasets/Names/vox.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Recipes/Lathes/mech_parts.yml
#	Resources/ServerInfo/Guidebook/Mobs/Vox.xml
2024-12-07 07:45:07 +03:00
Vigers Ray
67a1903332 Смена клавиши для взаимодействия с затвором и магазинами 2024-12-07 07:40:41 +03:00
Vigers Ray
3977d8ad2f Фиксы суицида 2024-12-07 07:33:48 +03:00
metalgearsloth
9365e3a99b
Predicted gas pumps (#33717)
* Predicted gas pumps

I wanted to try out atmos and first thing I found.

* a

* Remove details range
2024-12-07 14:39:52 +11:00
Vigers Ray
ff336595e7 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
2024-12-05 15:50:34 +03:00
Hreno
152cf3388b
Add cooldown to buttons in borg's laws UI (#31490) 2024-12-04 21:16:41 +11:00
Pieter-Jan Briers
c10a72be39
Fix layout on wires UI (#33714)
Layout would break for machines with >6 lights because the column count was hardcoded. Uncap the UI width and fix the rows count instead.

Lights with less than 4 characters of text weren't aligned right, now they are.
2024-12-04 21:13:22 +11:00
Vigers Ray
3eeeaaa05c
Реворк огнестрела под хитскан. (#755)
* Реворк огнестрела под хитскан

* борги на хитскане

* Анимация трассировки пули
2024-12-04 02:44:24 +03:00
Vigers Ray
6d2680043d Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
2024-12-03 20:37:10 +03:00
SpaceManiac
b800d98260
Fix lobby countdown not showing hours (#33685) 2024-12-02 13:29:44 -08:00
Vigers Ray
1025e3b2a0 фикс настройки удаления следов 2024-12-02 08:25:07 +03:00
Vigers Ray
e99ff5dc82 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
#	Resources/Prototypes/Entities/Structures/Machines/nuke.yml
#	Resources/migration.yml
2024-12-01 18:21:33 +03:00
pacable
343c84cfab
Теперь проще убирать следы (#720)
* Теперь проще убирать следы

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

* чистобот чистит грязь лучше

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

* Revert "добавление возможности выключать следы (#655)"

This reverts commit ae78fa10

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

* postfix

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

* исправление чистящих гранат по отношению к следам

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

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-12-01 17:53:44 +03:00
haiwwkes
dc7caa82c3
This is a temporary measure and will be reverted once the DMCA counterclaim process is completed. (#748)
* Revert "fix (#612)"

This reverts commit 2bfefd1b10.

* Revert "fix (#534)"

This reverts commit 7efd457a51.

* chore(content): temporarily restrict access pending DMCA counterclaim review
2024-12-01 17:40:55 +03:00
MilenVolf
5fdf03c216
Replace obsolete GetTilesIntersecting methods (#32455)
* Remove usage of obsolete GetTilesIntersecting round 1

* Oop wrong uids

* Remove usage of obsolete GetLocalTilesIntersecting round 2

* Remove usage of obsolete GetLocalTilesIntersecting final round

* weh

* Fix using `SharedMapSystem` in `StencilOverlay`
2024-12-01 12:56:47 +11:00
Nikolai Korolev
2d405c9652
Fix formatting IDE0055 warnings in VS Code (#33669) 2024-12-01 12:51:26 +11:00
Plykiya
fb76cd952e
Fix for inspecting entities in the stripping window (#33644)
Handle it
2024-11-30 17:23:26 +01:00
Plykiya
450bf813b8
Fix for inspecting entities in hand (#33642)
Actually inspect entity in hands
2024-11-30 17:14:39 +01:00
MilenVolf
6c86d7b32b
Cleanup some Client atmos systems (#33634)
* Cleanup `ScrubberControl.xaml.cs`

* Minor cleanups

* Another pile of minor cleanups

* Apply requested changes

* Rename "which" into "bound". Add whitespace after "if"
2024-11-30 02:33:29 +01:00
Vigers Ray
e97d944f9e Фикс "Добро пожаловать на хттпс://бусти.сом" 2024-11-29 05:17:34 +03:00
Vigers Ray
dbfa90e956 Звуковое оповещение новых ролей для призраков и вынос правил в отдельную кнопку. 2024-11-29 04:35:28 +03:00
Vigers Ray
aca6e6c473 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
#	Resources/Textures/Tiles/plating_burnt.png
#	Resources/Textures/Tiles/steel_burnt.png
2024-11-29 00:28:18 +03:00
Vigers Ray
667987a86c details textedit for votekick 2024-11-29 00:16:31 +03:00
Vigers Ray
8c77fcdd1b Revert "фикс RoundstartFtlTarget"
This reverts commit a3b12c17af.
2024-11-28 23:50:35 +03:00
beck-thompson
a790955b76
Light verb is now predicted (#33622)
Fix
2024-11-29 00:41:01 +11:00
Vigers Ray
a3b12c17af фикс RoundstartFtlTarget 2024-11-27 05:03:42 +03:00
Vigers Ray
78aa7aefe4 Уменьшил время на переподключение до 15с 2024-11-26 20:46:48 +03:00
Vigers Ray
18a7fb2d88 Вынес настройки билда в отдельную вкладку 2024-11-26 19:24:27 +03:00
Vigers Ray
0c1e15e516 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Info/LinkBanner.cs
#	Resources/Locale/en-US/_strings/atmos/gas-pipe-sensor.ftl
#	Resources/Locale/en-US/_strings/station-events/events/greytide-virus.ftl
#	Resources/Prototypes/Datasets/Names/diona.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
2024-11-26 17:50:59 +03:00
Babaev
ae78fa1048
a (#655) 2024-11-26 17:36:16 +03:00
Intoxicating-Innocence
d5225d1f46
Ghost role drop-down alignment (#33397)
* dropdown shares margin width with children

* removed dependency that rider added for some reason

* reduced vertical margin from 8 to 2
2024-11-26 09:28:31 +01:00
metalgearsloth
f27fa1ed30
Simplify separated screen top menu (#33047) 2024-11-26 01:59:34 +01:00
Nikolai Korolev
ea7f5433ac
Fix RA0003 warning for ChatBox (#33531) 2024-11-25 22:53:12 +11:00
Ben
32f48d974f
removed obsolete netmessage creator (#33542)
removed opsolete netmessage createor
2024-11-25 22:39:10 +11:00
eoineoineoin
bdf4a46edf
Minor improvements & fixes to Shuttle Console UI (#31623)
* Fix grids and docks being culled from display prematurely

* Fix inconsistent disabling of "Undock" buttons

* Add a radar icon to indicate where the controlling console is

* Tidy up math

Remove lots of sketchy transforms-of-transforms, which should have been
as single matrix multiply. Assign proper names to matrices. Remove some
redundant calculations.

* Feedback
2024-11-23 17:55:09 +11:00