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

8116 commits

Author SHA1 Message Date
VigersRay
b390abe77c Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-16 14:00:27 +03:00
Cojoke
927cf7799f
Remove uses of AllObjectives (#30077) 
Remove the uses of AllObjectives
 2024-07-16 10:17:18 +03:00
Winkarst
33a303236c
Make addgamerule command process only valid game rules (#29912) 
* addgamerule command processes only valid rules

* Update

* English moment
 2024-07-15 21:18:33 +02:00
Simon
b35539db4a
Fix some markup related obsolete warnings in research and anomaly related systems (#30072) 
Fix some Markup related obsolete warnings in Research and Anomaly related systems
 2024-07-15 22:14:37 +03:00
pacable
da73d87ab5
фикс крио (#199) 
* фикс крио

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

* убрал дебаг значение

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

* Update StationCryoTeleportComponent.cs

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2024-07-15 18:02:13 +03:00
pacable
31aa79a1dd
Изменение имени сервера в лобби (#198) 
* кд на баны 15 секунд

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

* теперь сервер в лобби можно настроить через cvar

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
 2024-07-15 01:26:59 +03:00
VigersRay
fe8edf03d4 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
 2024-07-15 01:24:12 +03:00
VigersRay
5fed5ad979 Куча разного говна которое давно должно было в билде. 2024-07-15 01:22:56 +03:00
osjarw
7d9653fff7
Fix HTN/NPC better plan selection (#30017) 
* recording commit

* Remove debugging/recording content
 2024-07-14 20:28:46 +10:00
VigersRay
c292c6e0a2 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-14 13:26:05 +03:00
lzk
011250f35e
Fix AGhostCommand naming (#29945) 2024-07-14 20:25:18 +10:00
VigersRay
5aaf638614 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Tools/gen_build_info.py
 2024-07-14 12:24:06 +03:00
osjarw
922be64290
NPC exits MeleeOperator on invalid EntityUid (#30005) 
EntityUid 0 problem fix
 2024-07-14 13:26:38 +10:00
Plykiya
b7aa97e203
Replace obsolete EntityCoordiates.InRange() with TransformSystem.InRange() (#29993) 
* Replace EntityCoordiates.InRange() with TransformSystem.InRange()

* nullspace

* I figured it out

* man I have no clue how client side sutff works

* please have mercy

* remove RadiationPulseOverlay changes

* nullspace

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-13 23:25:51 +02:00
Plykiya
a03b88979e
Replace obsolete xform.ToMap() with xformSystem.ToMapCoordinates() (#30010) 
* Get rid of a bunch of obsolete usages

* position

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-13 23:05:22 +02:00
VigersRay
2d61b8cc3c Динамический чейнжлог, выключение хаба серверов 2024-07-13 17:20:44 +03:00
VigersRay
a21b422dac Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-13 16:23:23 +03:00
Plykiya
87c82ff114
Update SpawnAfterInteractSystem.cs to not use Component.Owner (#29968) 
* Update SpawnAfterInteractSystem.cs

* what the fuck is that condition

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-13 21:50:21 +10:00
VigersRay
6736d14a81 фикс PlanetPrisonSystem 2024-07-13 13:08:17 +03:00
VigersRay
83090d089f Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png
 2024-07-13 12:55:55 +03:00
VigersRay
b67de90b52 Фикс цели зеков и автобан если покинут планету 2024-07-13 12:46:56 +03:00
deltanedas
87f7ea8aa9
make cargo balance ui updating its own component (#28295) 
* add BankClientComponent and event

* query BankClient instead of hardcoded CargoOrderConsole for updating

* add BankClient to all ordering consoles

* :trollface:

* add Balance field to BankClient

* forgor

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

* m

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-07-13 16:11:14 +10:00
Nemanja
49096cf14f
Watches (#29550) 
* watches

* rename

* add it into loot pools
 2024-07-13 16:09:19 +10:00
Plykiya
cb98b659ad
Update SalvageSystem.Magnet to not use Component.Owner (#29961) 
* Update SalvageSystem.Magnet.cs

* Update SalvageSystem.Magnet.cs the right way

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-13 14:20:17 +10:00
deltanedas
7b590122b6
fire extinguisher using item toggle (#29906) 
* move SprayAttemptEvent to shared

* add SolutionTransferredEvent

* replace FireExtinguisher with SpraySafety

* update fire extinguisher yml

* invert visuals

* always handle event in solution transfer, it makes popups

* instantly fill it

* untroll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-07-13 14:17:10 +10:00
Tayrtahn
3388c0dcaa
Fix antag objectives always overshooting MaxDifficulty (and kill tries20) (#29830) 
* The death of try20

* Add integration test for traitor gamerule

* Fix max difficulty being overshot

* Check at least one objective is assigned

* EntProtoId
 2024-07-13 14:14:30 +10:00
Plykiya
de2ab29f34
Update SmokingSystem.SmokingPipe.cs to not use Component.Owner (#29967) 
Update SmokingSystem.SmokingPipe.cs

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-13 14:06:54 +10:00
Plykiya
8ed9ea1586
Update TriggerSystem.TimedCollide.cs to not use Component.Owner (#29970) 
Update TriggerSystem.TimedCollide.cs

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-12 20:12:46 -07:00
Plykiya
5fa0844f3c
Update UtensilSystem.cs to not use Component.Owner (#29971) 
Update UtensilSystem.cs

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-12 20:00:34 -07:00
VigersRay
78980349cd Фикс метеоритов в тюрьме 2024-07-12 15:59:48 +03:00
VigersRay
4e6b856af5 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-12 15:46:31 +03:00
Plykiya
c94c72785d
Updates GasTankSystem and InternalsSystem to not use Component.Owner (#29934) 
* blah, setup

* Updates GasTankSystem and InternalsSystem to not use Component.Owner

* squish the diff

* Fixa the rest

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-12 21:44:45 +10:00
osjarw
3ee7d7bc35
Implement Health Consideration for NPCs (#29922) 
Implement TargetHealthCon
 2024-07-12 21:37:47 +10:00
chavonadelal
f53d0143ae
Localization of dungeon direction (#29911) 2024-07-12 19:24:37 +10:00
Plykiya
160364e100
Update BiomeSystem.cs to not use Component.Owner (#29939) 
Update BiomeSystem.cs

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-12 19:22:24 +10:00
VigersRay
4691d0fad5 Фикс телепортации в крио 2024-07-12 07:37:07 +03:00
VigersRay
08ab1bd3cd Фикс крио телепорта 2024-07-12 06:36:48 +03:00
VigersRay
ed452581ce Целью на убийство для антагониста может быть только экипаж основной станции 2024-07-12 06:16:42 +03:00
VigersRay
898730ee53 фикс счетчика сбежавших заключенных 2024-07-12 06:04:56 +03:00
VigersRay
9a928552f1 правки беглеца 2024-07-12 05:52:56 +03:00
VigersRay
bceb675012 Смена дня и ночи на транзит 2024-07-12 05:18:01 +03:00
VigersRay
9b78c5e9d9 SponsorLoadoutSystem 2024-07-12 04:53:31 +03:00
VigersRay
293e88ac94 фиксы линтера 2024-07-12 04:53:20 +03:00
pacable
0277e6e460
Реворк оружейки гамма кода (#177) 
* Реворк оружейки гамма кода

* Добавил объявление

* фикс гравы

* оформление

* фикс линтера

* фикс дельты и гравы

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2024-07-12 04:30:44 +03:00
pacable
6308c92c2d
Телепортация в криокапсулы ссд игроков. (#180) 
* Добавил автокрио

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

* release fix

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

* Update StationCryoTeleportComponent.cs

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2024-07-12 04:28:11 +03:00
Babaev
15c9545d31
Update SuitSensorComponent.cs (#183) 2024-07-12 04:23:02 +03:00
Vigers Ray
ffd3e3de14
Планетарная тюрьма (#187) 
* Тюрьма (#150)

* Prison Init

* Новая карта для планетарных тюрем

* Готовая планетарная тюрьма

* Незначительное изменение тайлов

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>

* Космическая тюрьма и всё остальное говно

* фиксы

* фикс PrisonlDoctor

* фикс PrisonDoctor

* день длится 20 минут

---------

Co-authored-by: SplikZerys <136282037+SplikZerys@users.noreply.github.com>
 2024-07-12 04:21:12 +03:00
VigersRay
094596a16a Вернул телепортацию зевак на станцию 2024-07-12 01:00:17 +03:00
VigersRay
30458496b6 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Server/Chat/Systems/AnnounceOnSpawnSystem.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
 2024-07-12 00:55:20 +03:00
chavonadelal
9a17154d83
Аnnouncement sender localization (#29907) 2024-07-12 00:02:53 +10:00