Commit graph

7876 commits

Author SHA1 Message Date
VigersRay
487bd91879 фикс реверта труб 2024-06-14 20:00:18 +03:00
VigersRay
562dc416a2 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/Construction/ConstructionSystem.Initial.cs
#	Resources/ServerInfo/Guidebook/Engineering/Fires.xml
2024-06-14 19:01:52 +03:00
Zonespace
6d71ec1b14
Non-uplink PDAs no longer can have TC inserted into them (#28985)
* PDAs no longer can have TC inserted into them

* far better way of doing this

---------

Co-authored-by: John Doe <johndoe@gmail.com>
2024-06-14 11:24:40 -04:00
Hannah Giovanna Dawson
3b3163c4f4
SS-28662 Add cvars to support forcing people to departures and making those at departures invincible (#28765)
* SS-28662 Add cvar to force spawn everyone at departures

This cvar means everyone must spawn at departures. This
could be handy for an admin event? But mostly it's so the
tutorial departures terminal can be seen by all newbies on
gateway servers.

* Small fix to ArrivalsSystem flow

* Remove incorrect todo

* Add godmode arrivals cvar
2024-06-14 04:15:42 -07:00
Tayrtahn
6c343ddae2
Move SleepingSystem to Shared & cleanup (#28672)
* Move SleepingSystem to Shared & cleanup

* Remove empty OnShutdown handler
2024-06-14 12:15:29 +10:00
Cojoke
57858cd6a5
Lasers passover objects like projectiles unless the target is clicked on (#28768)
* uh...

* fix

* alright, there we go

* Revert "alright, there we go"

This reverts commit 448180bfa58cc24c42a4d59ef34c017b9941f37b.

* Make lasers not hit certain objects and lying mobs unless clicked on

* comment

* Update Content.Server/Weapons/Ranged/Systems/GunSystem.cs

* an l vanished?

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-06-14 12:04:45 +10:00
osjarw
ad3f1f77b7
Nodescanner now works with right click (#26873) 2024-06-13 22:01:32 -04:00
MjrLandWhale
222d3b532d
Override under-pressure lock-out in air alarm "Fill" mode (#28909) 2024-06-13 15:25:02 -08:00
lzk
c3720f9fd9
Add order quantity to cargo invoice label (#28821) 2024-06-13 10:36:38 -08:00
Nemanja
221cb73d8c
Fix construction rotation (#28427) 2024-06-13 10:21:48 -08:00
Rinary
8d26cdd6a0
No valid arrival points found! (#107) 2024-06-13 16:36:28 +03:00
Rinary
3450799bc2
Фикс Ошибок Yaml linter, CRLF Check проекта (#109)
* Added Sound in Lobby

* Loadout Groups Locale Fix

* Может сначала укажем спрайт а потом указываем стейты с этого спрайта?

* Sprite in Icon

* Убрал лишнее из Audio

* SS13 Lobby Sound

* кто-то додумался запихнуть русские символы в название файла) Теперь git grep умирает от кодировки

* Прикольный вендомат(покупаешь за 1200, продаешь за 1290)

* backslash in file names fix

* No Cirilic in File Names
2024-06-13 16:35:57 +03:00
VigersRay
17b20aafdf Фикс голого злого двойника 2024-06-13 16:31:36 +03:00
Vigers Ray
e4c7ebb031
Игроки которые не наиграли 10 часов появляются сразу на станции. (#108) 2024-06-13 14:09:28 +03:00
VigersRay
b07e5eb660 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2024-06-13 09:47:00 +03:00
ShadowCommander
8791f98f0b
Fix playtime on player tab getting set to Unknown (#28876)
Update play time on admin panel player tab after db loads
2024-06-12 23:38:43 -07:00
Leon Friedrich
d38ad12262
Fix playtime_addrole command printing the wrong time (#28783) 2024-06-12 23:31:21 -07:00
deltanedas
d9bac82402
localize RoleBriefing (#28824)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-12 22:24:08 -04:00
Plykiya
1d4d6c3331
Fix gauze stopping if it stops bleeding (#28844)
delete a line

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-06-12 22:19:10 -04:00
Stalen
d322a82bdf
Pets toggle internals fix (#28904) 2024-06-12 22:17:07 -04:00
Verm
0e32d632fa
Make automatic gasps not create a chat message (#28907)
No chat gasp
2024-06-12 22:15:43 -04:00
Partmedia
dc0327c3c0
Update PA admin warnings (#28911)
With singulo fixed, PA strength 3 and below (level 2) are now safe.
Update the admin logging to reflect this.
2024-06-12 22:15:15 -04:00
VigersRay
71dbb925ae Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-13 03:53:00 +03:00
Vigers Ray
f1a53f5cfe
Шаттлы прибытия больше не отстыковывают все от станции (#92) 2024-06-13 01:58:49 +03:00
Partmedia
35e5a96b7e
Fix queued deletion check (singulo loosing at beyond PA 1 but only on live servers) (#28906)
Fix queued deletion check
2024-06-12 15:56:07 -07:00
dragonryan06
b091a55d7d
Add new icon for Remove Evidence verb (#28898) 2024-06-12 18:05:56 -04:00
VigersRay
8839e9c9df Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-13 00:22:11 +03:00
Robert V
94bf301a8b
Comms Consoles without CanShuttle can no longer recall (#28803)
Consoles without CanShuttle can no longer recall
2024-06-12 09:32:57 -04:00
Vigers Ray
7801bc468f Merge remote-tracking branch 'origin/master' 2024-06-12 12:58:57 +03:00
pacable
4fd33aa375
Продвинутое энергетическое оружие (#59)
* added advanced energy gun (AEG)

* added traitor objective targeting HoS' new gun

* fixed formatting

* added research tech unlocking energy weaponry

* me stupid
2024-06-12 12:58:17 +03:00
Vigers Ray
1f555b7190 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-12 12:42:00 +03:00
Tayrtahn
bd42c2b56a
Fix nearest beacon messages reporting the opposite direction (#28869)
* Fix nearest beacon messages reporting the opposite direction

* Lets document that method, shall we?
2024-06-11 18:18:30 -04:00
lzk
41a0ffba38
Add reward line in bounty label (#28853) 2024-06-11 12:33:36 +03:00
Vigers Ray
6e513690d5 удалил _priseQuery; 2024-06-11 06:51:31 +03:00
Vigers Ray
1051a91c98 Убрал мусор из спавна 2024-06-11 06:41:45 +03:00
Vigers Ray
a77768d293 Фикс бросания людей 2024-06-11 05:23:50 +03:00
Vigers Ray
4efee0349a фиксы выдачи аплинков 2024-06-11 04:53:10 +03:00
Vigers Ray
041663e3fc
Пацификатор (#58)
* Пацификатор

* перевод
2024-06-11 04:02:15 +03:00
Vigers Ray
c6142538a8 DontSell компонент вместо обнуления цены 2024-06-11 03:28:30 +03:00
Vigers Ray
4fd9a62618 Прибытие и ЦК теперь нельзя сломать и предметы на них ничего не стоят. 2024-06-11 02:57:44 +03:00
Vigers Ray
8feff8a350 Merge remote-tracking branch 'origin/master' 2024-06-11 01:52:21 +03:00
Vigers Ray
2592568873 Фикс спавна в космопорту 2024-06-11 01:18:50 +03:00
Vigers Ray
4a20ecfd08 Фикс выдачи ролей антагов в прибытии 2024-06-10 20:51:38 +03:00
pacable
cc596eb093
Оповещение о гриншифте на станции (#37)
* added announcement about greenshift. Also added event preset for admins.

* fix build errors

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-06-10 20:19:04 +03:00
Vigers Ray
30de0468ff Фикс громкости шепота 2024-06-10 17:21:56 +03:00
Vigers Ray
33e91b2512 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-10 01:17:06 +03:00
Vigers Ray
487879123f Фикс спаминга если не указан линк сервера для хаба 2024-06-10 00:33:29 +03:00
Hannah Giovanna Dawson
1bb9d9451f
Panic Bunker uses minutes not hours (#28805)
* Panic Bunker uses minutes not hours

* Fixing an instance of hours
2024-06-09 22:45:47 +02:00
Vigers Ray
19ff7831b6 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
#	Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
#	Resources/ServerInfo/Guidebook/SpaceStation14.xml
2024-06-09 22:32:37 +03:00
Vigers Ray
e160fc5422 Фикс стыковки шаттла прибытия. 2024-06-09 22:29:53 +03:00