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

10297 commits

Author SHA1 Message Date
A-Mironov
abf39617af
Обнова культа крови (#128) 
* stable

* sprite

* yes!

* LOCATOR TRANSLATION MISSING

* finally

* stable2

* stable

* stable?

* FIS

* Nerfs

* works

* Трек болгарыча и время призыва теперь 3 минуты

* f

* Update modifier_sets.yml

* Барьер больше не даёт 5 рун металла, ибо почему он должен?
 2025-11-30 00:06:35 +02:00
haiwwkes
4409201496 test (#3330) 
(cherry picked from commit 93d21e7d1c31bcc94cf67afb82bbb76ad1c8277e)
 2025-10-30 00:13:02 +03:00
SplikZerys
d63a277e0e NO TTS for cryo and latejoin announcements (#3265) 
Co-authored-by: Vigers Ray <vigersray@gmail.com>
(cherry picked from commit fc92be97fa)
(cherry picked from commit 797d08fbed63cf90ed52410c3fbcab8f62e1cf17)
(cherry picked from commit c18c290f824968427c501aef8fcc6ed8e720ffb1)
 2025-10-30 00:13:01 +03:00
Vigers Ray
ed619598f1 Merge remote-tracking branch 'space-sunrise/master' 2025-09-11 19:03:21 +03:00
Copilot
4c616c31ea
Implement ahelp cooldown feedback system for better user experience (#2881) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: Vigers Ray <vigersray@gmail.com>
 2025-09-10 03:36:25 +03:00
Copilot
5c5900f367
Запретить активацию и автоматически отключать энергетический щит в контейнерах (#2997) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: Vigers Ray <vigersray@gmail.com>
 2025-09-10 02:46:20 +03:00
Copilot
dbc194432c
Fix antagonist role revelation in kick voting (#1908) (#3012) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
 2025-09-09 22:18:06 +03:00
Vigers Ray
48bb8fabd7
Механика вещания через консоль связи (#3070) 2025-09-09 22:15:37 +03:00
Copilot
878167c937
Вернуть команду adminwho в общий доступ и реализовать UI с правильным client-server взаимодействием (#2918) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: Vigers Ray <vigersray@gmail.com>
 2025-09-09 22:06:57 +03:00
Copilot
aba00f7e8f
Implement Mentor Help System (MHelp) - Complete Ticket-based Help for Game Questions (#2915) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: Vigers Ray <vigersray@gmail.com>
 2025-09-09 20:54:52 +03:00
ReWAFFlution
f2d94238db Merge remote-tracking branch 'sunrise/master' 2025-08-28 21:15:52 +03:00
Copilot
25fdfa2b4d
Enhance collective mind TTS with individual voices and author display options (#2887) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: Vigers Ray <vigersray@gmail.com>
 2025-08-26 13:45:17 +03:00
worstplayerever
15a2c9f1d4
Красивый визуал телепортеру синдиката. (#3045) 2025-08-26 12:12:52 +03:00
Vigers Ray
f88ced5498 увы 2025-08-25 12:52:41 +03:00
ReWAFFlution
96b03227d8
Французский акцент робит (#2856) 2025-08-25 12:47:47 +03:00
temm1ie
7f6ad97616
Картридж анализатора растений в кпк (#2841) 2025-08-25 12:34:36 +03:00
Copilot
153c57f56b
Implement medical cyborg hypospray announcement and reagent preservation system (#2942) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
 2025-08-25 12:30:04 +03:00
Copilot
1d5b41f2a9
Add morgue alert sound to crew monitoring consoles for corpses outside morgues (#2975) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
 2025-08-25 11:59:54 +03:00
Copilot
201cd843ee
Фикс автоматического крио-телепорта для тел без мозга (#2993) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
 2025-08-25 11:59:16 +03:00
Copilot
0e03ca1033
[Предложение] Добавлены дымовые и светошумовые гранаты для ниндзи (#3003) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
 2025-08-25 11:57:42 +03:00
worstplayerever
41406cfe73
Биокод телепортеру синдиката (#3014) 2025-08-25 11:56:41 +03:00
Copilot
90870e609a
Implement cyborg TTS voice changing with robot effect and sponsor voice validation (#2936) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: Vigers Ray <vigersray@gmail.com>
 2025-08-25 11:55:33 +03:00
Vigers Ray
5d3d6a484c фикс уведа об отсутствии выбора 2025-08-25 07:40:14 +03:00
Vigers Ray
f5ff03d394 фикс рассинхрона оповещений 2025-08-25 07:09:03 +03:00
ReWAFFlution
c5fca9e384 Merge remote-tracking branch 'sunrise' 2025-08-25 05:43:34 +03:00
Vigers Ray
923845021b фикс апстрима 2025-08-25 04:03:10 +03:00
Vigers Ray
5e89b697f6 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
#	Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
#	Resources/Maps/_Sunrise/Station/marathon.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
 2025-08-25 03:48:48 +03:00
Daniel
7b3f255732
CopyMachineFix (#2900) 
Co-authored-by: Vigers Ray <vigersray@gmail.com>
 2025-08-25 03:19:03 +03:00
Copilot
c39491fe62
Реворк системы оповещений: пространственные динамики с очередью и умной фильтрацией чата (#3000) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: Vigers Ray <vigersray@gmail.com>
 2025-08-25 02:47:27 +03:00
M4rchy-S
6c154fb79e
Moving FlammableComponent to Shared (#39870) 2025-08-24 13:46:23 -07:00
Whatstone
b5529ecf2b
Batchable lathe jobs, editable lathe job order (#38624) 
* batchable lathe jobs, editable order

* requested changes

* LatheComponent comment, menu strings
 2025-08-24 17:02:47 +02:00
slarticodefast
30aa61c29c
Changeling cleanup and bugfix (#39843) 
* fixes and cleanup

* key
 2025-08-24 15:50:19 +02:00
Princess Cheeseballs
91a4cee6e1
[Bugfix] Lizard smite fix (#39842) 
Fix

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-08-24 09:34:56 -04:00
Copilot
e23a8d821d
Implement Navigator cartridge for PDA with station map display (#2984) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: Vigers Ray <vigersray@gmail.com>
 2025-08-24 07:02:54 +03:00
Vigers Ray
6a68898417 упс 2025-08-24 05:28:47 +03:00
āda
ab681dbcbb
GameRuleOnTrigger (#39845) 
* Gaming

* commit

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-08-24 01:10:55 +02:00
Copilot
bc55df1fe3
Улучшения Крысиного Короля: увеличен лимит армии, добавлены гвардейцы (#2923) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: KaiserMaus <kaiser.ratte@gmail.com>
Co-authored-by: Vigers Ray <vigersray@gmail.com>
 2025-08-24 01:47:46 +03:00
FungiFellow
ed7bea8e01
Inflatable Module (#35100) 
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
 2025-08-23 15:15:28 -07:00
Vigers Ray
2dfd952b40 фиксы апстрима 2025-08-23 23:49:03 +03:00
Vigers Ray
252e81c728 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
#	Content.Server/Mindshield/MindShieldSystem.cs
#	Content.Shared/Gravity/SharedGravitySystem.cs
#	Content.Shared/Implants/SharedSubdermalImplantSystem.cs
#	Resources/Locale/en-US/_strings/traits/traits.ftl
#	Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
#	Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
#	Resources/Prototypes/Entities/Objects/Misc/implanters.yml
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
#	Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
#	Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
 2025-08-23 23:10:05 +03:00
Vigers Ray
a6175696c0 Merge remote-tracking branch 'space-sunrise/master' 2025-08-23 02:27:27 +03:00
ViolentMonk
91fc0f4378
Invert HasMouthAvailable check (#39834) 2025-08-22 15:26:48 -07:00
slarticodefast
d4f96fd1c6
predict morgue and crematorium (#39293) 2025-08-21 16:49:50 -07:00
Southbridge
f67cebf7a4
Admin Log Browser Improvements (#39130) 2025-08-21 22:12:16 +02:00
slarticodefast
9c546a0072
Predict Mind Roles (#39611) 2025-08-21 03:10:07 +02:00
Prole
f78280501a
Moving Zombie Components to Shared (#39791) 
* Moving Comps to Shared

* Requested Changes
 2025-08-21 01:35:38 +02:00
Copilot
c0edcd703d
Make ninja NVG dependent on suit charge instead of own battery (#2866) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: Vigers Ray <vigersray@gmail.com>
 2025-08-20 23:37:28 +03:00
slarticodefast
2bbff7f8c0
Cleanup subdermal implant code (#39755) 2025-08-20 13:52:03 +02:00
Tayrtahn
95b0df9a89
Fix nuke disk getting lost when polymorphed holder is deleted (#36058) 
* Delete original entity when polymorph is deleted

* Switch to EntityTerminatingEvent

* Add RevertOnDelete option to PolymorphPrototype

* Fix error on server shutdown while polymorphed

* Set RevertOnDelete to false by default

* AsNullable

* Revert "Set RevertOnDelete to false by default"

This reverts commit 087c43fbb923c9369c61c9d001e18814b3de3aca.

* Use pattern matching instead of .Value
 2025-08-20 00:02:41 -07:00
Perry Fraser
b317d7514f
fix: don't do emergency shuttle stuff in lobby (#38732) 2025-08-19 23:52:52 -07:00