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

258 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
5fed5ad979 Куча разного говна которое давно должно было в билде. 2024-07-15 01:22:56 +03:00
Vigers Ray
1d7a75070c
Roadmap (#188) 
* Копипаст смуглефа

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

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

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

---------

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
 2024-07-12 04:13:29 +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
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
chavonadelal
04cb2657bf
Action menu localization (#29839) 2024-07-09 23:37:00 +10:00
VigersRay
1a9950886a Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-05 20:02:52 +03:00
DrSmugleaf
11034a0986
Fix showing the inventory button on entities without any inventory slots (#29728) 2024-07-06 00:25:23 +10:00
Vigers Ray
ff592a6963
Обнова лобби (#171) 
* Обнова лобби

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

* Убрал YouTubeWindow
 2024-07-04 09:44:28 +03:00
VigersRay
465ccb630e фикс открытия призрак ролей для спонсоров 2024-07-01 22:40:00 +03:00
VigersRay
06dcab6a05 Фиксы спонсорки 2024-07-01 17:24:00 +03:00
VigersRay
ff394987f4 Обнова спонсорки 2024-07-01 17:03:24 +03:00
VigersRay
60cbcb2e9d Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Resources/migration.yml
 2024-06-28 07:56:45 +03:00
Repo
4a728fa3c6
Fix Admin Object tab sorting and search - Part 2 (#28681) 
* admin Object tab sorting and searchable

* Fix for showing disconnected players on player admin tab

* Fix namespace and search bar location.

* Change linq to loop.

* No more Linq to sort

* Fix item click vv menu

* Added refresh button and refresh on opening tab.

* Clear spaces.

* Move tab magic numbers to enums

* Get rid of old unused xaml

* Fix code style issues and button event type.

* Merge in baby jail

* More style cleanup and move cast around.

* Make the localization a little more easy to read, same loc var names.

* Missed Loc for label

* Fix class field order

* Over zelous delete.

* Small updates.

* Min syntax issues fix
 2024-06-28 13:32:57 +10:00
VigersRay
a8876c7549 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Resources/Prototypes/lobbyscreens.yml
#	Resources/Textures/LobbyScreens/attributions.yml
#	Resources/Textures/LobbyScreens/blueprint.webp.yml
#	Resources/Textures/LobbyScreens/justaweekaway.webp.yml
 2024-06-25 23:31:06 +03:00
DrSmugleaf
a4d93362c3
Attempt to fix random test fail by undeleted AlertControl._spriteViewEntity (#29424) 2024-06-25 11:31:38 +10:00
VigersRay
24c8d682f9 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-16 01:36:33 +03:00
DrSmugleaf
2ddebba0e9
Fix speech bubble occlusion being checked from the player's position instead of the eye's (#29012) 2024-06-15 17:35:05 -04:00
VigersRay
aa156c2c86 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs
#	Content.Shared/Preferences/Loadouts/RoleLoadout.cs
 2024-06-15 21:05:02 +03:00
AJCM-git
c339773b5f
Fixes the ShowRulesCommand and the client not syncing rules correctly (#28752) 2024-06-15 00:41:25 -04:00
Vigers Ray
19ff7831b6 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
#	Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
#	Resources/ServerInfo/Guidebook/SpaceStation14.xml
 2024-06-09 22:32:37 +03:00
Hannah Giovanna Dawson
3ceb92a0c4
SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) (#28763) 2024-06-09 14:58:10 -04:00
AJCM-git
346ac44a28
Open the guidebook when people with less than an hour playing join the round (#28774) 
* Open the guidebook when people with less than an hour playing join the round

* Filter for gameplayState

* Fix tests

* tweaks

* saltern update (#28773)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Fix admin menu objects list (#28787)

* Make `MakeAntag()` log errors instead of throwing exceptions (#28771)

Make `MakeAntag()` log errors instead of throw

* add default page support for the guidebook (#28772)

* Probably a better way to handle this

---------

Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2024-06-09 12:26:48 -04:00
Vigers Ray
d7b054c032 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
 2024-06-09 00:50:47 +03:00
DrSmugleaf
0762f9da17
Fix action icons when dragging an active action to another slot (#28692) 2024-06-07 22:34:48 -07:00
AJCM-git
63e0ee08cb
Fixes client having authority over rules popup cvars (#28655) 
* Fixes client having authority over rules popup cvars

* Delete duplicate migration

* Pre-update

* Post-update
 2024-06-07 21:53:20 +02:00
VigersRay
f5911d8eac Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-07 16:37:58 +03:00
AJCM-git
accf8adf97
Fixed the guidebook listing every single rule (#28680) 
* Well i tried this way

* New approach (start)

* Did it

* makes spacelaw available, put it under sec
 2024-06-07 06:28:55 -05:00
VigersRay
7d0476aab0 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Shared/Roles/JobPrototype.cs
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Roles/Antags/nukeops.yml
#	Resources/Prototypes/Roles/Antags/revolutionary.yml
#	Resources/Prototypes/Roles/Antags/traitor.yml
#	Resources/Prototypes/Roles/Antags/zombie.yml
 2024-06-07 11:28:58 +03:00
Leon Friedrich
e7f2ae52ab
Give jobs & antags prototypes a guide field (#28614) 
* Give jobs & antags prototypes a guide field

* A

* space

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

* Add todo

* Fix merge errors

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-06-06 05:05:58 -07:00
Nemanja
1333b48747
Convert rules to use guidebook parsing (#28647) 2024-06-06 03:11:26 -04:00
Repo
039fd932b2
Fix Admin Object tab sorting and search (#28609) 2024-06-06 02:41:11 -04:00
Vigers Ray
e0566ffa3e
Хаб серверов (#13) 
* Хаб серверов внутри игры

* чейнжлог
 2024-06-04 10:03:48 +03:00
AJCM-git
be35a5d369
Header of Gas tank UI screen now fetched from Entity name and local (#28545) 2024-06-02 23:33:30 -04:00
ShadowCommander
3ed1ee6a5b
Add search filter to the admin menu player tab (#28030) 2024-05-31 02:28:08 -04:00
Pieter-Jan Briers
cf8fcb170a
Remove bogus C# finalizers (#28315) 
Begging people to learn how this programming language works before throwing random syntax into a file.

None of these finalizers ever worked. I also checked whether they were memory leaks and needed *proper* shutdown logic, but they're all instantiated-once UI controls that last for the entire lifetime of the program so it's probably fine.
 2024-05-27 17:52:23 -04:00
Leon Friedrich
12841da9a1
Fix storage UI interactions (#28291) 
* Fix storage UI interactions

* Add VV support
 2024-05-26 12:11:37 +10:00
Nemanja
8a95cb186c
Remove AlertType and AlertCategory (#27933) 2024-05-23 22:43:04 -04:00
Nemanja
868b6c202d
fix orphaned storage grid pieces getting stuck to the cursor (#27960) 
* fix orphaned storage grid pieces getting stuck to the cursor

* instead of denying it, update it smartly
 2024-05-17 00:51:28 -07:00
Kara
855234aa30
Resolve 'TransformComponent.MapPosition' is obsolete in content (#27939) 
* Resolve `'TransformComponent.MapPosition' is obsolete: 'Use TransformSystem.GetMapCoordinates'` in content

* build?
 2024-05-12 10:31:54 -04:00
DrSmugleaf
9741fda672
Add ActionPerformedEvent, ActionsSystem.SetIfBiggerCooldown, action id to action events and BackgroundOn field (#27682) 
* Add ActionPerformedEvent and ActionsSystem.SetIfBiggerCooldown

* Add action id to action events and backgroundon field to action component
 2024-05-10 20:04:01 -04:00
no
630a7a78ed
Add ghost role raffles (#26629) 
* Add ghost role raffles

* GRR: Fix dialogue sizing, fix merge

* GRR: Add raffle deciders (winner picker)

* GRR: Make settings prototype based with option to override

* GRR: Use Raffles folder and namespace

* GRR: DataFieldify and TimeSpanify

* GRR: Don't actually DataFieldify HashSet<ICommonSession>s

* GRR: add GetGhostRoleCount() + docs

* update engine on branch

* Ghost role raffles: docs, fix window size, cleanup, etc

* GRR: Admin UI

* GRR: Admin UI: Display initial/max/ext of selected raffle settings proto

* GRR: Make a ton of roles raffled
 2024-05-06 18:48:16 -07:00
DrSmugleaf
c20df3e39f
Fix AlertControl throwing an error if the sprite view entity is deleted multiple times (#27690) 
* Fix AlertControl throwing an error if disposed multiple times

* Replace default check with deleted check
 2024-05-05 21:38:55 -04:00
deltanedas
ff762e56a7
add ghostnado button to warp menu (#27556) 
* add ghostnado button to warp menu

* translator ops

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-05-01 06:59:35 -07:00
Leon Friedrich
6471f55a49
Action UI fixes (#27468) 2024-04-29 18:36:18 +10:00
Morb
16b3e2233a
Emotes Menu (#26702) 
* Basic emote radial menu

* Move out from corvax

* Move to UI controller & add to top menu bar and key bind

* Make emote play

* Add name localization for emotes

* Localize chat messages

* Fix emote menu

* Add categories localization

* Fixes

* Fix

* Add emotes entity blacklist

* Fix entity whitelist required all logic

* Remove unused wagging emote

* Revert sprite

* Set default texture for emote icon

* Update Resources/keybinds.yml

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2024-04-28 21:38:23 -07:00
Tainakov
6d6e7f0c98
[Admin QOL] +Adminchat flag (#26930) 2024-04-27 13:17:46 +02:00
metalgearsloth
5896e68752
Content update for UI prediction (#27214) 
* Content update for UI refactor

* Big update

* Sharing

* Remaining content updates

* First big update

* Prototype updates

* AUGH

* Fix UI comp ref

* Cleanup

- Fix predicted message, fix item slots, fix interaction range check.

* Fix regressions

* Make this predictive

idk why it wasn't.

* Fix slime merge

* Merge conflict

* Fix merge
 2024-04-26 18:16:24 +10:00