rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
25736 commits 1 branch 0 tags 1.2 GiB
Commit graph

7839 commits

Author SHA1 Message Date
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
Julian Giebel
de07c291de
Implement map text (#28705) 2024-06-09 15:18:54 -04:00
Hannah Giovanna Dawson
3ceb92a0c4
SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) (#28763) 2024-06-09 14:58:10 -04:00
Vigers Ray
48312aa29b фикс ползунков ТТСа (очередной) 2024-06-09 20:24:37 +03:00
Vigers Ray
1350a1fba0 Указывать голос для озвучки оповещений с консоли в прототипе 2024-06-09 17:45:28 +03:00
Vigers Ray
b3352e3196 Оптимизация NPC 2024-06-09 17:28:42 +03:00
Vigers Ray
de1e769c75 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-09 17:20:07 +03:00
Vigers Ray
599c3f6b05 Исправление системы переноса гуманоидов 2024-06-09 17:18:58 +03:00
Babaev
f51d4aef47
Возможность брать людей на руки (#31) 
* carry

* fix

* carriable update

* Removed carriable from vox, slime

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2024-06-09 17:01:25 +03:00
Leon Friedrich
ad9d18771e
Make MakeAntag() log errors instead of throwing exceptions (#28771) 
Make `MakeAntag()` log errors instead of throw
 2024-06-09 09:53:03 -04:00
Vigers Ray
3e5002ec81
Тразитный хаб и играбельное ЦК (#51) 
* Тразитный хаб и играбельное ЦК

* Правки и лоадауты для ролей ЦК

* Фиксы

* приоритет для ролей ЦК

* Остальные приколы для хаба
 2024-06-09 16:39:56 +03:00
Vigers Ray
7a5eeb0431 Убрал яркие паралаксы 2024-06-09 06:32:26 +03:00
Vigers Ray
1edd48004d
Плач и крики при получении урона. (#50) 
* фикс спонсорских лоадаутов

* paws

* чейнжлог
 2024-06-09 06:16:55 +03:00
Vigers Ray
fa6503cd8f Убрал лобби арты 2024-06-09 03:46:55 +03:00
Vigers Ray
d7b054c032 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
 2024-06-09 00:50:47 +03:00
Rinary
5c82638cdb
Удаление дублей в файлах локализации (#39) 
* Vulpkanin Lang Fix

* Remove Double Added Strings in Locale(It's bad)

* More

* Food

* Organs

* End

* Merge?
 2024-06-09 00:46:26 +03:00
GimmyPick
af626ce89b
Revert "Prevent stacking pipes (#28308)" (#43) 
This reverts commit 44b93e68ee.

Co-authored-by: Poopp <poopjimpoop@gmail.com>
 2024-06-09 00:37:14 +03:00
VigersRay
46ebf102ce фикс ттса 2024-06-09 00:27:16 +03:00
Tayrtahn
7f686a6ae5
Fix null ref exception in PrayerSystem (#28712) 
* Fix null ref exception in PrayerSystem

* Also check that prayable ent/comp still exist
 2024-06-08 14:50:20 -04:00
Nemanja
4089d6a664
fix singulo decay (#28743) 2024-06-09 00:36:47 +10:00
nikthechampiongr
8cf9037273
Make freeze, freeze & mute, and unmute verbs work on disconnected players. (#28664) 2024-06-08 20:40:33 +10:00
Leon Friedrich
2c7598fd5b
Fix flatpacker (#28736) 
* Fix flatpacker

* a
 2024-06-08 18:48:23 +10:00
DrSmugleaf
a7c7cd74ec
Fix DamageOtherOnHit.OnDoHit when the target is terminating or deleted (#28690) 2024-06-08 15:53:54 +10:00
Lyndomen
1584a50a1d
Dropping Corpses Devoured by Space Dragons on Gib/Butcher. (#28709) 
* Update DevourSystem.cs

* Update DevourSystem.cs

* Update Content.Server/Devour/DevourSystem.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-06-08 15:49:42 +10:00
DrSmugleaf
7f1933169e
Add DoPopup data field to OnUseTimerTrigger (#28691) 2024-06-07 22:36:29 -07:00
Flareguy
f37060fc1b
Ports the singularity's values from vgstation (#28720) 
* ports the singularity values from vgstation

* guidebook fix

* 5000 energy level 6 singulo
 2024-06-07 22:15:13 -04:00
Plykiya
d19b430a92
Swap some InRangeUnobstructed for InRangeUnoccluded (#28706) 
Swap InRangeUnobstructed to InRangeUnoccluded

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-06-07 20:57:07 -04:00
AJCM-git
63e0ee08cb
Fixes client having authority over rules popup cvars (#28655) 
* Fixes client having authority over rules popup cvars

* Delete duplicate migration

* Pre-update

* Post-update
 2024-06-07 21:53:20 +02:00
VigersRay
c01034d336 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
 2024-06-07 20:16:41 +03:00
Leon Friedrich
b632a65385
Add JobRequirementOverride prototypes (#28607) 
* Add JobRequirementOverride prototypes

* a

* invert if

* Add override that takes in prototypes directly
 2024-06-07 09:43:02 -07:00
VigersRay
d600e36278 Паралакс из станции корвакса 2024-06-07 11:43:34 +03:00
VigersRay
7d0476aab0 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Shared/Roles/JobPrototype.cs
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Roles/Antags/nukeops.yml
#	Resources/Prototypes/Roles/Antags/revolutionary.yml
#	Resources/Prototypes/Roles/Antags/traitor.yml
#	Resources/Prototypes/Roles/Antags/zombie.yml
 2024-06-07 11:28:58 +03:00
Vigers Ray
eef1472e53
Секрет в голосовании за карту. Автоматическое голосование в конце раунда (#36) 
* Секрет в голосовании за карту

* Автоматическое голосование за карту в конце раунда

* чейнжлог
 2024-06-07 11:25:19 +03:00
Vigers Ray
72affc5f7a
Очередь озвучки анонсов, фиксы багов и оптимизация генерации ттсов. (#35) 
* Очередь на озвучку оповещений

* Фикс ошибок клиента и оптимизация ттса

* Укоротил сообщения о кодах

* чейнжлог
 2024-06-07 11:04:08 +03:00
Leon Friedrich
e7f2ae52ab
Give jobs & antags prototypes a guide field (#28614) 
* Give jobs & antags prototypes a guide field

* A

* space

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Add todo

* Fix merge errors

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-06-06 05:05:58 -07:00
Nemanja
1333b48747
Convert rules to use guidebook parsing (#28647) 2024-06-06 03:11:26 -04:00
Plykiya
dec1c281a8
Internals are kept on as long as any breathing tool is on (#28595) 2024-06-06 03:01:45 -04:00
Tayrtahn
d71b88a747
Add support for LocalizedDatasets to RandomMetadata (#28601) 2024-06-06 02:37:49 -04:00