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

4538 commits

Author SHA1 Message Date
Vigers Ray
041663e3fc
Пацификатор (#58) 
* Пацификатор

* перевод
 2024-06-11 04:02:15 +03:00
Vigers Ray
4fd9a62618 Прибытие и ЦК теперь нельзя сломать и предметы на них ничего не стоят. 2024-06-11 02:57:44 +03:00
Vigers Ray
a5582bcdd1 Шлюзы космопорта и шаттла прибытия будут давить людей что стали в них. 2024-06-11 01:52:15 +03:00
Vigers Ray
33e91b2512 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-10 01:17:06 +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
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
Nemanja
c549573f7a
add default page support for the guidebook (#28772) 2024-06-09 11:55:21 -04: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
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
Vigers Ray
3e5002ec81
Тразитный хаб и играбельное ЦК (#51) 
* Тразитный хаб и играбельное ЦК

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

* Фиксы

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

* Остальные приколы для хаба
 2024-06-09 16:39:56 +03:00
Rinary
5d34b76518
Отображение даты в КПК (#47) 
* Vulpkanin Lang Fix

* Date time add

* Time System

* Something fixes
 2024-06-09 02:59:06 +03:00
Vigers Ray
c1e35df808 Поддержка спонсорских лоадаутов 2024-06-09 02:42:34 +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
VigersRay
101bd74836 фикс бага в конце раунда 2024-06-09 00:27:33 +03:00
metalgearsloth
e3c37f6e9b
Maybe fix invalid loadout prototypes (#28734) 
* Maybe fix invalid loadout prototypes

So if we have existing data SetDefault is not normally called iirc. So what I think is happening is that if we have old loadout groups that get saved to DB and loaded these get dropped entirely and nothing is used to replace the group unless the person specifically looks at their loadout.

Need someone affected to send me their loadout to confirm it's fixed.

* Better fix
 2024-06-08 14:48:09 -04:00
metalgearsloth
1fdbf9403a
Don't use invalid defaults for loadouts (#28729) 
At the time it made more sense but now with species specific stuff it's better to have nothing.
 2024-06-08 14:43:21 -04:00
Nemanja
4089d6a664
fix singulo decay (#28743) 2024-06-09 00:36:47 +10:00
Whisper
123dfee3a3
allow ' in character names (#28652) 2024-06-08 20:37:55 +10:00
metalgearsloth
45015188cd
Add loadout group check for role proto (#28731) 
MFW same bug twice at 2 layers because I'm stupid.
 2024-06-08 20:03:54 +10:00
Leon Friedrich
2c7598fd5b
Fix flatpacker (#28736) 
* Fix flatpacker

* a
 2024-06-08 18:48:23 +10:00
DrSmugleaf
7f1933169e
Add DoPopup data field to OnUseTimerTrigger (#28691) 2024-06-07 22:36:29 -07: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
Vigers Ray
f0e4dca059
Нижнее белье (#42) 
* Нижнее белье

* упс

* ограничение на пол для белья

* чейнжлог
 2024-06-07 20:12:45 +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
f5911d8eac Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-07 16:37:58 +03:00
AJCM-git
accf8adf97
Fixed the guidebook listing every single rule (#28680) 
* Well i tried this way

* New approach (start)

* Did it

* makes spacelaw available, put it under sec
 2024-06-07 06:28:55 -05: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
pacable
a731e5016c
Собачье зрение и его трейт (#32) 
* Adds dogvision to game

* Added DogVision to vulps, corgi, walter and mcgriff

* changelog

* locale fix + added category

* Buffed vulps

* Removed dog vision from vulps, nerfed eyesight

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2024-06-07 11:14:54 +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
Tayrtahn
d71b88a747
Add support for LocalizedDatasets to RandomMetadata (#28601) 2024-06-06 02:37:49 -04:00
Leon Friedrich
ba57e3e4d9
Add closing storage UIs to StorageInteractionTest (#28633) 2024-06-05 18:14:25 -04:00
Nemanja
729e67af7f
Machine-code cleanup (#28489) 2024-06-05 16:23:23 -04:00
Plykiya
d75de9fa24
Make cuff default range again (#28576) 
* Make cuff default range again

* uncuff distance

* how about ONE

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-06-05 13:14:56 -07:00
VigersRay
5137a7f93c фиксы апстрима 2024-06-05 19:42:05 +03:00
VigersRay
6a29776e4f Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml
 2024-06-05 19:28:35 +03:00
Vigers Ray
ad4b3a2c2c
Удобный монитор камер и портативный мониторинг для детектива. (#25) 
* Улучшение мониторинга камер

* Портативный монитор камер для дека

* чейнжлог
 2024-06-05 19:27:15 +03:00
Leon Friedrich
adeed705e6
Add Job preference tests (#28625) 
* Misc Job related changes

* Add JobTest

* A

* Aa

* Lets not confuse the yaml linter

* fixes

* a
 2024-06-06 00:19:24 +10:00
Vigers Ray
21465c02c0
Отображение времени к прибытию эвак шаттла в КПК (#22) 2024-06-05 14:34:36 +03:00
VigersRay
3fffebca49 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-05 13:15:24 +03:00
Vigers Ray
e838e56ca8
AlwaysUseSpawner и фикс спавна ролей без спавнеров (#20) 2024-06-05 12:08:54 +03:00
TsjipTsjip
86cf5cc7d1
Prayable datafield typo (#28622) 
* notifiactionPrefix -> notificationPrefix

* notifiactionPrefix -> notificationPrefix
 2024-06-05 10:32:58 +03:00
VigersRay
fda36aef3b tts.client_enabled default true 2024-06-04 23:37:44 +03:00
c4llv07e
555ca4110d
Add option to disable sending TTS events to client (#16) 2024-06-04 21:50:59 +03:00