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
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#534 )"
This reverts commit 7efd457a51
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
Winkarst
0a587c9ccc
Disable submit admin note button on switch to note ( #33456 )
...
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
2024-11-23 17:41:28 +11:00
slarticodefast
de516905f0
another rename
2024-11-22 23:39:05 +01:00
slarticodefast
306277afe0
rename
2024-11-22 23:05:36 +01:00
slarticodefast
08bfb43feb
cleanup
2024-11-22 23:02:59 +01:00
slarticodefast
5a9a2d463b
Merge branch 'master' into powerhud
2024-11-22 19:38:55 +01:00
c4llv07e
646d41d3a7
Add telegram to the server info-links ( #33459 )
2024-11-22 16:38:41 +01:00
Vasilis
94ac0b1399
Modern HWID integration ( #33265 )
2024-11-22 11:08:51 +00:00
Vigers Ray
a55a740ba3
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-11-22 06:44:44 +03:00
DrSmugleaf
5a751a820a
Fix admin ghosts not being able to see items in pockets or interact with them ( #31076 )
...
* Fix admin ghosts not being able to see items in pouches or interact with them
* fix
* oops
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-11-22 03:56:05 +01:00
slarticodefast
3758715bdc
electrification hud
2024-11-22 00:43:02 +01:00
Pieter-Jan Briers
75a096b6bd
Merge remote-tracking branch 'upstream/master' into 24-10-29-modern-hwid
2024-11-21 01:26:01 +01:00
Vigers Ray
1c05542382
Фикс гост ролей с требованиями
2024-11-20 19:30:45 +03:00
Vigers Ray
8d0ab85920
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Construction/UI/ConstructionMenuPresenter.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Silicons/Laws/SiliconLawSystem.cs
# Resources/Locale/en-US/_strings/clothing/components/magboots-component.ftl
# Resources/Locale/en-US/_strings/singularity/components/generator-component.ftl
# Resources/Prototypes/Datasets/Names/borer.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
# Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
# Resources/migration.yml
2024-11-20 17:50:33 +03:00
metalgearsloth
a818c2a134
Temporarily make singularity a bit harder to loose as non-antag ( #33358 )
2024-11-20 16:55:58 +11:00
Saphire
44db676b24
Actually make the emagging popup work properly
2024-11-20 09:32:50 +06:00
qwerltaz
e98383d572
Construction menu grid view ( #32577 )
...
* button
* implement populate grid view
* tweak min width
* Make grid button toggle visible
* tweak min window size
* fix missing recipe button when mirroring item
* make grid buttons toggleable
* align button texture vertically
* selected grid item has plain color background
* tweak window width so all buttons look good
* rename select method, defer colouring
* get icon better
* whoops
* simpler button toggle
* spritesys frame0, move spritesys
* delete old sprite system refs
2024-11-20 12:54:49 +11:00
SlamBamActionman
89392e2424
Remove drag & drop dropping items from containers ( #32706 )
...
* Initial commit
* Update based on maintainer discussion
* Forgot to remove this woops
2024-11-20 12:00:38 +11:00
Vigers Ray
603af43241
фиксы апстрима
2024-11-19 18:50:55 +03:00
Vigers Ray
d853b875eb
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/LobbyUIController.cs
# Content.Client/Lobby/UI/CharacterSetupGui.xaml
# Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/GameTicking/GameTicker.Lobby.cs
# Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
# Content.Server/Store/Systems/StoreSystem.Ui.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Resources/Maps/_Sunrise/Shuttles/abandoned_outpost.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
2024-11-19 18:34:32 +03:00
dffdff2423
2c82a2dfc0
Add admin remarks button to lobby ( #31761 )
2024-11-15 23:09:29 -06:00
Saphire Lattice
e7e1d96051
Improve crayon UI to not be stuck in 1996 ( #33101 )
...
* Improve crayon UI to not be stuck in 1996
* Make a horrifying crayon spaghetti
* Crayon
* Undeprecate the crayon, describe the crayon
2024-11-15 21:25:06 -06:00
Vigers Ray
fba2af74b3
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/labeler.yml
# .github/workflows/labeler-needsreview.yml
# .github/workflows/labeler-untriaged.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml
# Resources/Prototypes/tags.yml
# Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
# Resources/migration.yml
2024-11-15 14:52:30 +03:00
