Vigers Ray
7c8a5ae4c2
Фикс энерго мечей. Фикс смены цвета работы каргой агента. карту агента, эсворды, пИИ синдиката и одежду хамелеона больше не могут использовать не синдикаты.
2024-12-02 07:31:30 +03:00
Vigers Ray
22fde339f5
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-12-02 02:25:52 +03:00
MilenVolf
b3841e8414
Fix BuckleSystem always marking InteractHandEvent as Handled ( #33602 )
...
* Add check before marking event as handled
* Update Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Cleanup
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-01 23:09:34 +01:00
Vigers Ray
f7a64283f5
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-12-01 23:57:04 +03:00
MilenVolf
d4067bcaab
Fix wrong system usage ( #33679 )
...
Fix wrong system using
2024-12-01 11:34:18 -08: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
021c9832ef
Fix for handcuffing someone more than once ( #33646 )
...
* Fix for over-cuffing someone
* comment
2024-11-30 16:58:56 +01:00
lunarcomets
b45c9d5129
fix PermanentBlindnessComponent to be not so permanent ( #33292 )
...
* adjust min blindness back to 0 when PermanentBlindnessComponent is removed
* mapinit changes
* remove OnRemove, move changes to OnShutdown
* goodbye event
* dependency removal
* final adjustment
---------
Co-authored-by: lunarcomets <luanrcomets2@gmail,com>
2024-11-30 13:56:52 +11: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
beck-thompson
a790955b76
Light verb is now predicted ( #33622 )
...
Fix
2024-11-29 00:41:01 +11:00
pacable
a2255aba9d
Включил джетпаки на станциях без гравитации. ( #722 )
...
* adfasvcxzv
* убрал оскорбление :clueless:
2024-11-27 19:39:56 +03:00
Vigers Ray
40afc86d4a
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-11-27 19:03:22 +03:00
Myra
1bc65624c8
Merge stable into master: Hotfix the randomly occurring DeleteAllThenGhost test failures ( #33593 )
2024-11-27 09:05:31 +00:00
slarticodefast
c861c56a69
Fix space ambient music ( #33594 )
2024-11-27 16:32:39 +11:00
Vigers Ray
28e7f2f0bf
да пошли они нахуй эти ошибки
2024-11-27 04:18:09 +03:00
Errant
eb9540364e
Hotfix the randomly occurring DeleteAllThenGhost test failures ( #33582 )
...
* clear mindrole on component shutdown
* let it go
2024-11-27 00:56:35 +01:00
Vigers Ray
9ac23e1b29
Поднял часы для вотекика
2024-11-26 23:19:18 +03:00
Vigers Ray
efe5eda0e1
Включил голосование за кик
2024-11-26 18:36:46 +03:00
Vigers Ray
f444eceb39
Перенес ПРы ласта на санрайз.
2024-11-26 18:25:51 +03:00
Vigers Ray
c326cfdaf6
фиксы апстрима
2024-11-26 18:01:48 +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
slarticodefast
470c869ce2
Greytide Virus station event ( #33547 )
...
* proof of concept
* full implementation
* I commited a crime
* t
* min players increase
2024-11-27 00:50:20 +11:00
slarticodefast
e9eca826d8
minor AI cleanup ( #33555 )
...
* minor cleanup
* to
2024-11-26 09:39:04 +11:00
slarticodefast
3c6c5ab6c9
fix airlocks inconsistently auto-closing after unbolting ( #33524 )
...
fix door auto close timer
2024-11-25 15:26:54 +11:00
Winkarst
f706170ee1
Draw muzzle flash below mobs ( #33465 )
...
* Draw muzzle flash below mobs
* Better naming
---------
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
2024-11-24 15:20:00 +11:00
metalgearsloth
11dbf50ed6
Add delay to AutoOrient ( #33479 )
...
It functions identically to how V1 of orientation worked and it's incredibly annoying.
2024-11-23 17:52:58 +01:00
metalgearsloth
11dae2ff93
Don't show drag-drop outline if climbing ( #33477 )
...
It won't actually do anything.
2024-11-23 12:19:59 +01:00
metalgearsloth
c3786a56dc
Fix door animations mispredicting if closing is interrupted ( #33481 )
...
* Fix door animations mispredicting if closing is interrupted
On master it will flicker states a little bit partially due to it not being predicted.
Instead we'll just set it straight back to opening (no animation is ever played anyway).
* no log
2024-11-23 10:31:07 +01:00
MetalSage
a42bacd3a9
Fix startingGear storage ( #33394 )
...
* fix starting gear storage
* removal of unused
---------
Co-authored-by: MetalSage <metalsage.official@gmail.com>
2024-11-23 17:54:35 +11: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
Vigers Ray
ff709156a1
Что за хуйню я сделал.
2024-11-22 06:37:49 +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
f0fa21479f
Борги как транспорт
2024-11-20 19:32:04 +03:00
Vigers Ray
721766319c
фиксы апстрима
2024-11-20 17:55:48 +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
Vigers Ray
3e09e890ea
Борги при смене типа меняют роль в манифесте экипажа и отправляют оповещения в бинарный и научный канал. ( #675 )
2024-11-20 17:39:46 +03:00
Vigers Ray
b8bc7f39ad
Небольшие изменения стандартных цваров
2024-11-20 14:08:10 +03:00
metalgearsloth
a9be561ea7
Merge branch 'master' into ion-storm-refactor
2024-11-20 18:22:08 +11:00
metalgearsloth
a818c2a134
Temporarily make singularity a bit harder to loose as non-antag ( #33358 )
2024-11-20 16:55:58 +11:00
