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

126 commits

Author SHA1 Message Date
pacable
65165685d6
fix (#506) 
Signed-off-by: pacable <igor.mamaev1@gmail.com>
 2024-10-30 10:04:34 +03:00
Vigers Ray
6a8317d76e Цвар на отключение планетарнои тюрьмы 2024-10-21 05:49:27 +03:00
haiwwkes
40568a243c
lay down + scope (#476) 
* remove old system

* new scope, new laying
 2024-10-11 11:52:39 +03:00
pacable
641ce5c958
Судейский молоточек. (#481) 
* судейский молоточек и наковальня

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

* добавил максимальное количество использований молоточку

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

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
 2024-10-10 20:07:45 +03:00
VigersRay
918213bee5 Фиксы апстрима 2024-10-10 19:27:49 +03:00
VigersRay
2638cd0709 Фиксы тестов 2024-10-08 10:31:46 +03:00
haiwwkes
b8032baa9d
tweaks. (#465) 
* tweaks.

* aaaaaa

* aaaaa

* Revert "aaaaa"

This reverts commit d95c6d6cedeac70d9c882533f115c229a69ee38a.

* yes

* AlwaysPoweredMap, remove biomes.

* forget..

* sky

* Updated map

* Update PlanetPrisonStationSystem.cs

* Update EmergencyShuttleSystem.cs

---------

Co-authored-by: SplikZerys <tronezero700@yandex.ru>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2024-10-07 08:45:23 +03:00
pacable
9a37e68869
Мешок с землей (#461) 
* Добавил мешок с землей

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

* fix тавтологии

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

* fix stamina

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

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
 2024-10-07 01:17:24 +03:00
VigersRay
5a679bd004 УУУУУУУ СУУУУКААААААА 2024-10-03 17:30:02 +03:00
haiwwkes
5efc51b304
tweaks (#451) 
* tweak: add RestrictedRange to prison and transit hub.

* tweak: make laydown better

* ay lmaoo
 2024-10-03 17:23:41 +03:00
SplikZerys
27ee3abaa8 Revert "Proton (#420)" 
This reverts commit 939249a3
 2024-10-02 09:05:30 +03:00
Rinary
23dba7f1ad
init (#414) 2024-09-30 16:18:51 +03:00
pacable
939249a38b
Proton (#420) 
* Proton-1 finished!

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

* fix

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

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
 2024-09-30 16:15:53 +03:00
pacable
61f4a724f0
фикс (#328) 
Signed-off-by: pacable <igor.mamaev1@gmail.com>
 2024-09-30 16:12:46 +03:00
VigersRay
1b104845e5 Фикс голосовой маски 2024-09-26 21:38:22 +03:00
VigersRay
045a0c25fe фиксы 2024-09-19 16:57:23 +03:00
Rinary
64f1aed90c
Большие изменения (#345) 
* init

* мать масштаба тарабанил

* fix

* upd

* upd

* upd

* upd

* upd

* console spam fix

* hohohohohohohooooonkeeeeeeeeeeeeeerrrrrrrrrrrsssssssss........

* fix

* fix

* upd

* upd

* some fixes

* fix

* upd

* upd translation for steal obj

* teg translate

* upd

* fix locale + add advertisements

* translate configurator

* Fully translate

* upd

* Я манал это переводить, позже переведу

* upd en-US

* fix Linter

* upd

* fix

* upd

* fix

* fix

* fix

* Возврат ПНТ

* remove agent non silent equipment

* add acid to uplink

* carrySystem new popups

* fix

* fix

* fix disease locale

* add Disease Guide

* upd locale

* upd

* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit 4130d241fc47fb80924c0dd3b9c9a2db85af8a25, reversing
changes made to 30abf7341ecce404f61f64e2000ad327964fcb00.

* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit 4e5a50d21c29be8482f31e49db253b1ed17a0ae4, reversing
changes made to 449cd7bfd50f29eb653e68ba60e3f0b9310f0443.

* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit a4679665ef441d4b63a92dc3c4e217e2cdedbc16, reversing
changes made to a80ef96cfbbc3cc737045e41a2f063a0910bf1ce.

* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit 94f585756bb27d10a1be7fab1f340d79b7c0a213, reversing
changes made to 906d18a3f66eaed73f3a894d70971872904fad4e.

* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit d0a7c6436ba5c175b0e00d69f495ba51f9aac645, reversing
changes made to e7933332274b336af1fc2a960264bc546c95d208.

# Conflicts:
#	Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
#	Resources/Prototypes/Roles/Jobs/departments.yml

* fix

* upd

* upd

* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit 042a3f112bbc32a622108475ac28081eb0bbbf9f.

# Conflicts:
#	Content.Server/Dragon/DragonRiftSystem.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
#	Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
#	Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
#	Content.Server/Zombies/ZombieSystem.cs
#	Content.Server/_Sunrise/NPCSleep/NPCSleepSystem.cs
#	Resources/Changelog/Changelog.yml
#	Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
#	Resources/Prototypes/Entities/Clothing/Head/helmets.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Roles/Jobs/departments.yml
#	Resources/Prototypes/Store/categories.yml
#	Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
#	Resources/ServerInfo/Guidebook/Security/Defusal.xml
#	Resources/ServerInfo/Guidebook/Security/Forensics.xml
#	Resources/migration.yml

* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit 2860e1d217a71be0c29684e020b2278c3f08685f.

# Conflicts:
#	Resources/Changelog/Changelog.yml

* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit 0dc7ea17e23d844ce93118db7812b844e36dda4f.

# Conflicts:
#	Resources/Changelog/Changelog.yml
#	Resources/Prototypes/Hydroponics/randomMutations.yml

* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit 439926b3c60e95cc2e701d84a032b17471a7c18e.

* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit 14160ab99909bf6b6f996f415d9dcfd5d4addbba.

# Conflicts:
#	Resources/Changelog/Changelog.yml

* fix

* upd

* upd uplink

* upd

* fix linter
 2024-09-16 19:05:38 +03:00
pacable
4003138ff5
removed role replacements (#353) 2024-09-16 14:36:34 +03:00
VigersRay
3bbae85466 фиксы апстрима 2024-09-16 13:13:35 +03:00
VigersRay
6f40a35c77 Небольшие фиксы и улучшения хаба серверов 2024-08-30 19:19:06 +03:00
pacable
2743d76d38
реворк афродезиака (#337) 
Signed-off-by: pacable <igor.mamaev1@gmail.com>
 2024-08-30 10:44:43 +03:00
VigersRay
6b134a0888 Фиксы апстрима 2024-08-28 20:17:03 +03:00
pacable
c71b0c37b6
Spray paint (#321) 
* paints

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

* review changes

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

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
 2024-08-28 18:15:38 +03:00
Babaev
d22c6ce7bd
Таяры (#324) 
* init

* update
 2024-08-28 18:15:15 +03:00
pacable
0db9a089ab
Доработал чатфильтр (#325) 
* доработал фильтр для капитализации

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

* К сожалению -> к сожалению

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

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
 2024-08-28 18:14:49 +03:00
VigersRay
c26740c082 Поддержка несколько провайдеров ТТС 2024-08-22 11:48:18 +03:00
pacable
a3ffc2e9f4
Аавтозамена сокращений имени должности (#306) 
* автозамена сокращения имени должности

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

* Update ChatSystem.cs

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2024-08-22 06:25:00 +03:00
VigersRay
53766506e5 OOOOPSIIIIE 2024-08-18 19:32:47 +03:00
VigersRay
9e3a968a31 фикс отключения npc 2024-08-18 00:47:01 +03:00
VigersRay
1b87be482a Merge remote-tracking branch 'origin/master' 2024-08-17 16:48:46 +03:00
Lgibb18
913b27a9de
абуз форматирования чата, емаг боргов итд (#290) 2024-08-17 16:48:02 +03:00
VigersRay
02d70899cb Вынос отключения НПС в _Sunrise 2024-08-17 16:40:07 +03:00
VigersRay
83c07de28d Милость Господняя 2024-08-15 23:48:18 +03:00
VigersRay
16c4eef3ff Фикс майншилда двойника 2024-08-15 01:22:30 +03:00
VigersRay
0cad2d9442 лигуб блядь рот твой на ласт стейшен я полоскал 2024-08-14 22:26:59 +03:00
Lgibb18
95da9625e8
Разумная болезнь опять (#157) 
* disease

* eula

* disease 2

* why

* fix

* фикс рси и локализаций

* update

* Revert "update"

This reverts commit ac33a3a1124175a87b82a72ed49f228e8c6c8aa6.

* фикс работоспособности, опять

* никакого лигуба, только санрайз

* санрайзотизация прототипов, спавн болезни

* ещё всякая хрень

* фуу статистика в конце раунда

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2024-08-14 22:17:14 +03:00
pacable
0fbd734906
Фикс парикмахера (#278) 
* fix

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

* accessfix

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

* locale fix

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

* accessfix

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

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
 2024-08-14 20:36:11 +03:00
VigersRay
a615fdadb5 1984 2024-08-14 18:34:30 +03:00
Vigers Ray
c2d4a2b859
Пушки (#267) 
* Расширение огнестрела (#195)

* Automatic changelog update

* Расширение огнестрела. (Roadmap)

Добавил 44 вида огнестрела.
Поменял стандартное вооружение СБ и КТ.

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

* исправил структуру

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

* багфикс и ребаланс

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

* теперь патроны можно делать на техфабе сб

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

* исправил цену производства .35 калибра

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

* фикс пистолетных патронов

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

* фикс локализации

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

* Убрал хуйню

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

* реверт карт

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

* реверт изменений

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

* пока я удалял хуйню я добавил хуйню

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

* комментарий

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

* надеюсь...

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

* Delete Resources/Maps/_Sunrise/planet_prison.yml

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>

* блеять

* во имя логики

* фиксы

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
Co-authored-by: pacable <77161122+pxc1984@users.noreply.github.com>
 2024-08-08 08:46:42 +03:00
VigersRay
65db2701fe Оверлей урона 2024-08-08 08:09:14 +03:00
VigersRay
7d1e890e49 Адекватное обновление хаба серверов. 2024-08-07 22:26:52 +03:00
VigersRay
e701a4316b фиксы апстрима 2024-08-05 21:54:07 +03:00
pacable
56d8e23d48
Казни: возвращение (#256) 
* Казни: возвращение

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

* отключил казнь соседей

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

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
 2024-07-31 03:44:16 +03:00
pacable
4dad2eb4fb
Это вам не просто смайл (#255) 
* улучшенный смайл

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

* у смайла есть суперспособность

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

* -костыль

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

* зомби-смайл теряет способности

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

* более надежный метод взятия трансформа

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

* Update smile_actions.yml

* Update pets.yml

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2024-07-31 03:43:40 +03:00
pacable
a454597d95
Парикмахер (#252) 
* барбер работает, осталось замаппить его кабинет

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

* bruh

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

* прототип электробритвы и красителей для волос

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

* красители для волос

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

* добавил функционал электробритве

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

* барбервенд

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

* спаунпоинт

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

* обрезал механ зеркала

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

* грамматическая ошибка

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

* до конца убрал костыль

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

* до конца убрал костыль2

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

* перенос из папки оффов

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

* праздник щиткода!

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

* коробка

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

* продвинутая униформа

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

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
 2024-07-29 06:26:32 +03:00
Vigers Ray
4ee05b0350
Продвинутые борги (#247) 
* Ну типа всё

* InnateItemSystem и фичи для пИИ
 2024-07-27 10:23:34 +03:00
VigersRay
864219a5d1 Фикс коефициента зеков и охранников тюрьмы 2024-07-25 00:51:26 +03:00
VigersRay
5a4b9eb80a Поблажки экипажу 2024-07-24 21:47:15 +03:00
VigersRay
e5797fd507 Фикс злого двойника 2024-07-24 21:35:04 +03:00
VigersRay
5cbdf34536 фикс LateJoinSpawnRule 2024-07-24 20:46:09 +03:00