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

4207 commits

Author SHA1 Message Date
VigersRay
9b78c5e9d9 SponsorLoadoutSystem 2024-07-12 04:53:31 +03:00
VigersRay
05928c5561 GhostThemeSystem 2024-07-12 04:39:44 +03:00
Rinary
0bd0a4537c
Перевод меню строительства (#179) 
* init

* upd.

* more furniture entries

* furniture fully added entries

* lightning.ftl

* machines.ftl

* Merge branch 'ConstructionLocalization' of https://github.com/Rinary1/space-sunrise into pr/179

* materials.ftl

* modular.ftl

* Create utilities.ftl

* Create tools.ftl

* Create structures.ftl

* storage.ftl

* upd storage.ftl

* translate storage.ftl

* translate modular.ftl

* translate materials.ftl

* translate machines.ftl

* translate lighting.ftl

* furniture.ftl translate

* add tiles.ftl

* bots, tools translate

* misc add, translate

* Translate some missing weapons

* some translations

* clothing description

* fun.ftl description

* Steps Translation

* Revert something

* New Steps translatings, Web items translate

* and some new Web translatings

* door staps translate

* NameLocalization

* ooops

* Всё по новой, перевод шагов был дерьмо, теперь materials.ftl

* some new reverts

* фикс?

* apc icon

* some clears

* steps fully translate

* translate

* Locale Search fix

* пу-пу-пу

* ой

* Revert "apc icon"

This reverts commit 65a3eab80453ab758b6a1e1c155d34938f481644.

---------

Co-authored-by: Babaev <babaevyt210@gmail.com>
 2024-07-12 04:26:24 +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
Vigers Ray
1d7a75070c
Roadmap (#188) 
* Копипаст смуглефа

* Дорожная карта санрайза

* Мелкие фиксы

* Небольшие фиксы

---------

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
 2024-07-12 04:13:29 +03:00
VigersRay
64934fae00 фиксы 2024-07-12 01:14:20 +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
Winkarst-cpu
bb67364900
Better admin note popups text visibility (#29909) 
* Better admin note popup text visibility

* Bring buttons closer to the border
 2024-07-12 00:03:21 +10:00
VigersRay
eb93d4c9f3 Фикс хаба в лобби 2024-07-11 15:25:11 +03:00
VigersRay
bee5d0410f Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Lobby/LobbyUIController.cs
#	Resources/Locale/en-US/chemistry/components/mixing-component.ftl
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Recipes/Crafting/crates.yml
#	Resources/ServerInfo/Guidebook/Mobs/Diona.xml
#	Resources/ServerInfo/Guidebook/Mobs/Species.xml
#	Resources/ServerInfo/Guidebook/Science/Science.xml
#	Resources/ServerInfo/Guidebook/Science/Technologies.xml
#	Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/migration.yml
 2024-07-11 14:05:37 +03:00
deltanedas
02636386b5
item toggling giga rework + full ninja refactor (#28039) 
* item toggle refactoring and some new systems

* add ToggleClothing component/system

* unhardcode magboots gravity logic

* make magboots and speedboots use ItemToggle and stuff

* remove now useless clothing components

* update client/server magboots systems

* add note to use ItemToggledEvent in ToggleActionEvent doc

* refactor PowerCellDraw to use ItemToggle for ui open/close control

* add TryUseCharges, refactor charges system

* update magboot trigger code

* make borg use ItemToggle, network SelectedModule instead of now removed Activated

* add AccessToggle for borg

* the giga ninja refactor

* update ninja yml

* update ItemToggle usage for some stuff

* fix activatableui requires power

* random fixing

* yaml fixing

* nuke ItemToggleDisarmMalus

* make defib use ItemToggle

* make things that use power not turn on if missing use charge

* pro

* fix sound prediction

* bruh

* proximity detector use ItemToggle

* oop

* big idiot syndrome

* fix ninja spawn rule and make it generic

* fix ninja spawn rule yml

* move loading profiles into AntagLoadProfileRule

* more ninja refactor

* ninja yml fixes

* the dreaded copy paste ops

* remove useless NinjaRuleComponent and ue AntagSelection for greeting

* fix invisibility

* move IsCompleted to SharedObjectivesSystem

* ability fixes

* oop fix powercell instantly draining itself

* sentient speedboots gaming

* make reflect use ItemToggle

* fix other test

* loadprofilerule moved into its own pr

* remove conflict with dragon refactor

* remove all GenericAntag code from ninja

* )

* probably

* remove old enabled

* great language bravo vince

* GREAT LANGUAGE

* who made this language

* because it stinks

* reparent blood-red magboots to magboots probbbly works

* most of the review stuff

* hasGrav doesnt mean what i thought it did

* make health analyzer use itemtoggle, not fail test

* fix mag/speed boots being wacky

* UNTROLL

* add ItemToggle to the random health analyzers

* a

* remove unused obsolete borg func

* untrolling

* :trollface:

* fix test

* fix

* g

* untroll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-07-11 15:55:56 +10:00
Chief-Engineer
6371a04621
Fix baby jail (#29896) 
* Revert "Revert Baby Jail (#29891)"

This reverts commit 24a2866747.

* the fix
 2024-07-11 15:14:01 +10:00
Vasilis
24a2866747
Revert Baby Jail (#29891) 
* Revert "SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) (#28763)"

This reverts commit 3ceb92a0c4.

* Revert configs

* Oops
 2024-07-11 10:33:47 +10:00
Winkarst-cpu
adcbe8d0be
Character menu asks if you want to save your character on exit (#29875) 
* Character menu asks if you want to save your character on exit

* Fix

* Another fix, little mistake by me

* Update Content.Client/Lobby/UI/CharacterSetupGuiSavePanel.xaml.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-07-11 10:24:37 +10:00
beck-thompson
91740ef5be
Fix typing indicators! (#29492) 
* First commit

* Removed pause stuff

* Make the event better

* Forgot to add the comment

* Proto id stuff

* cool comments

* serializer

* Added the time stuff
 2024-07-10 15:51:47 +10:00
dffdff2423
e8b3042a38
Add an option to the admin fax menu to lock papers such that they can't be edited by cybersun pens (#28972) 
* Add option to adminfax for locking papers.

* Replace dummy control with margin
 2024-07-10 15:28:36 +10:00
chavonadelal
04cb2657bf
Action menu localization (#29839) 2024-07-09 23:37:00 +10:00
chavonadelal
f3342c5155
localization and change of appearance of the phrase about the remaining time (#29844) 2024-07-09 23:36:33 +10:00
slarticodefast
92e2980534
Improve throwing precision (#29726) 
* improve throwing precision

* remove debugging logs

* minor fixes

* f

* Update Content.Shared/Throwing/LandAtCursorComponent.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-07-08 19:03:53 +10:00
Nemanja
0e9ed36b85
Intercom buffs and fixes (#29580) 
* Intercom buffs and fixes

* remove unused bui state

* mild sec intercom buff

* reinforce sec intercoms
 2024-07-08 00:19:10 +10:00
metalgearsloth
4c5c6a84dc
Shuttle map button tweaks (#29757) 
- Avoids adding pending objects we can never show so the list should fill much faster.
 2024-07-06 13:51:55 +10:00
VigersRay
1a9950886a Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-05 20:02:52 +03:00
VigersRay
cdf4e8dae0 Редизайн лобби 3 2024-07-05 20:02:44 +03:00
DrSmugleaf
11034a0986
Fix showing the inventory button on entities without any inventory slots (#29728) 2024-07-06 00:25:23 +10:00
VigersRay
8420fd6ad2 Редизайн лобби 2 2024-07-05 10:22:18 +03:00
VigersRay
a6b78a9d80 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Resources/Prototypes/Species/vox.yml
 2024-07-04 16:48:42 +03:00
Pieter-Jan Briers
8d015f5c9f
Fix animation looping bugs. (#29457) 
Summary of the problem is in the corresponding engine commit: a4ea5a4620

This commit requires engine master right now.

I think #29144 is probably the most severe one, but I touched Jittering and RotatingLight too since they seemed sus too.

Fixes #29144

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-07-04 18:02:43 +10:00
metalgearsloth
2988ac3839
Make vox roundstart (#29704) 
* Make vox roundstart

I believe all the issues are fixed.

* Click detection bandaid
 2024-07-04 17:11:01 +10:00
Vigers Ray
ff592a6963
Обнова лобби (#171) 
* Обнова лобби

* Небольшой фикс

* Убрал YouTubeWindow
 2024-07-04 09:44:28 +03:00
VigersRay
9f2d4053e3 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/UserInterface/Controls/RadialContainer.cs
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	Resources/Prototypes/Loadouts/role_loadouts.yml
 2024-07-04 09:23:18 +03:00
VigersRay
fad28cea0f Удаление КПБ 2024-07-04 09:14:22 +03:00
Rinary
9120f5fada
Dynamic Radial Menus (#29678) 
* fix

* Clean Some Code

* Some Commentaries

* Update Content.Client/UserInterface/Controls/RadialContainer.cs

* Update Content.Client/UserInterface/Controls/RadialContainer.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-07-04 11:25:25 +10:00
Leon Friedrich
1faa1b5df6
Allow zoom command to modify an eye's PVS range (#29245) 
Allow zoom command to modify an eye's PVS range

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-07-03 16:44:55 +10:00
VigersRay
ba0c961e1e Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
#	Resources/Prototypes/game_presets.yml
 2024-07-02 20:29:10 +03:00
slarticodefast
daae8253c6
Fix MouseRotator on rotated grids (#29663) 
* fix harm mode rotation

* cleanup

* -pi to pi
 2024-07-02 23:04:15 +10:00
Rinary
5b722ab555
Фишки снаряжения (#165) 
* init

* some translatings

* Service loadout translate

* Сварочные очки у робототехника

* Существование такой вещи как комментарии ломает ftl?

* comments fix
 2024-07-02 13:44:48 +03:00
Tayrtahn
b565258f12
Fixed buckled players thrashing while speaking in beds (#29653) 
* Fix characters thrashing when talking while lying down

* Remove weird design choice
 2024-07-01 23:30:53 -04:00
VigersRay
465ccb630e фикс открытия призрак ролей для спонсоров 2024-07-01 22:40:00 +03:00
VigersRay
3da51ff368 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-01 19:44:09 +03:00
jmcb
ca87fb8bc5
Fix showing tips on the login screen from the localized tip dataset (#29640) 
Regression introduced in #28285
 2024-07-01 12:27:49 -04:00
VigersRay
aaa7976d7c А кто тут гений копипаста? Да да я 2024-07-01 19:22:06 +03:00
VigersRay
652bb1e5e8 Отключение спонсорских рас 2024-07-01 18:50:52 +03:00
VigersRay
33c1d3814f Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Server/GuideGenerator/ReagentEntry.cs
#	Resources/Prototypes/Datasets/ion_storm.yml
#	Resources/Prototypes/GameRules/events.yml
 2024-07-01 18:10:48 +03:00
VigersRay
06dcab6a05 Фиксы спонсорки 2024-07-01 17:24:00 +03:00
VigersRay
ff394987f4 Обнова спонсорки 2024-07-01 17:03:24 +03:00
metalgearsloth
b6cf2ce524
Add FTL arrival visuals (#29402) 
* Add FTL arrival visuals

* weh

* Update Content.Shared/Shuttles/Components/FTLComponent.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
 2024-07-01 16:11:30 +10:00
Nemanja
84282ca016
Remove blurry vision examine mispredict (#29633) 
remove blurry vision examine mispredict
 2024-07-01 13:06:28 +10:00
Nemanja
162913ccd0
Selectable Bar Signs (#29068) 
* make bar sign selectable

* ajcm strongest soldier

* AJCM comes down hard for round 2

* good shit

* ok ballin

* bless'ed be the webedit
 2024-07-01 02:20:57 +10:00
Partmedia
f4c7339870
Auto-scale sensor monitoring graph (#29559) 2024-06-30 09:48:20 -04:00
Plykiya
1eb3a3e6d1
Fixes lathe usage of EntityPrototypeView (#29608) 
Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-06-30 21:45:43 +10:00