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

4238 commits

Author SHA1 Message Date
VigersRay
a8e5e66277 Апстрим 2024-07-18 17:07:25 +03:00
Ed
d8ab4982ad
Character menu issuer localization (#29840) 
* Update CharacterUIController.cs

* TODO Burn this shit

* huh?

* huh!

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
 2024-07-17 08:47:50 +03:00
VigersRay
b390abe77c Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-16 14:00:27 +03: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
VigersRay
a3e61685c8 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-15 18:04:05 +03:00
Pieter-Jan Briers
c0593fb328
Fix invalid UI hover/click sounds breaking client (#30067) 
fixes #29561
 2024-07-15 16:55:05 +02: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
Pieter-Jan Briers
b7d3964c56
Fix AccessLevelControl breaking (#30045) 
#29987 did an oopsie

This broke the ID computer, station records, and maybe some others too.
 2024-07-15 00:07:48 +02:00
Ed
1c74ffb8e4
Ambient music rules refactor (#29921) 
* refactor

* dutypo
 2024-07-14 23:58:48 +10:00
VigersRay
c292c6e0a2 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-14 13:26:05 +03:00
Winkarst
960cc806cc
Update AccessLevelControl.xaml.cs to use ISawmill (#29987) 
* Update AccessLevelControl.xaml.cs to use ISawmill

* Update

* Silly me

* Update
 2024-07-14 20:24:26 +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
Winkarst
5d1702d280
Update MainMenu.cs to use ISawmill (#29988) 
* Update MainMenu.cs to use ISawmill

* Update

* Error
 2024-07-14 13:05:39 +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
Winkarst
bf4ef62ab3
Update RadiationPulseOverlay.cs to have 0 warnings (#30004) 2024-07-13 18:45:34 +02:00
VigersRay
506346f6c1 упс 2024-07-13 17:25:03 +03: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
6c1d1057d5
Replace DetachParentToNull() with DetachEntity() (#29992) 
DETACH PARENT TO ENTITY

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-13 20:59:33 +10: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
CaasGit
ac768fe9f1
fix(SharedGunSystem): Return and debug log on CreateEffect. (#29656) 
Sometimes CreateEffect is called on a Invalid Entity. This now causes
that to check, thus returning out and printing some hopefully helpful
logs to try to track down the real source of this issue.
 2024-07-13 16:12:57 +10:00
slarticodefast
eb4ce85354
Remove imagesharp and StatusEffectAddedEvent from FlashOverlay (#28930) 
remove imagesharp and StatusEffectAddedEvent from FlashOverlay
 2024-07-13 16:10:04 +10:00
Nemanja
49096cf14f
Watches (#29550) 
* watches

* rename

* add it into loot pools
 2024-07-13 16:09:19 +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
Winkarst
e11f1e6cf6
Update ActionAlertTooltip.cs to use TryFromMarkup (#29975) 2024-07-13 14:05:51 +10:00
Plykiya
3acc100ae5
Update ShuttleDockControl.xaml.cs to not use Component.Owner (#29966) 
Update ShuttleDockControl.xaml.cs

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-13 14:05:31 +10:00
VigersRay
4e6b856af5 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-12 15:46:31 +03:00
Plykiya
b6672f087f
Update MapScreen.xaml.cs to not use Component.Owner (#29938) 
Update MapScreen.xaml.cs

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-12 19:21:54 +10:00
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