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

100 commits

Author SHA1 Message Date
Vigers Ray
54603545e9 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-11 11:34:22 +03:00
dffdff2423
f571e23037
Enable save button on changing job unavailable preference (#28839) 
Enable save button on changing unavailable pref

Fix an issue where the save button was disabled when just changing your job unavailable preference
 2024-06-11 12:48:23 +10:00
Vigers Ray
95e12f45e1 фикс SRLateJoinGui 2024-06-10 16:41:57 +03:00
Vigers Ray
d734c85266 Окно позднего присоединения с фронтира 2024-06-10 01:14:24 +03:00
Vigers Ray
ccf8bd6d1f фикс спонсорских лоадаутов 2024-06-09 05:38:24 +03:00
Vigers Ray
c1e35df808 Поддержка спонсорских лоадаутов 2024-06-09 02:42:34 +03:00
Vigers Ray
6dd8e2c326 фикс ширины названий в окне выбора антагонистов 2024-06-09 01:26:58 +03:00
VigersRay
c01034d336 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
 2024-06-07 20:16:41 +03:00
Leon Friedrich
b632a65385
Add JobRequirementOverride prototypes (#28607) 
* Add JobRequirementOverride prototypes

* a

* invert if

* Add override that takes in prototypes directly
 2024-06-07 09:43:02 -07: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
VigersRay
6a29776e4f Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml
 2024-06-05 19:28:35 +03:00
Leon Friedrich
adeed705e6
Add Job preference tests (#28625) 
* Misc Job related changes

* Add JobTest

* A

* Aa

* Lets not confuse the yaml linter

* fixes

* a
 2024-06-06 00:19:24 +10:00
VigersRay
211d39b98b Небольшой скейл окнаServersHub 2024-06-04 11:47:49 +03:00
VigersRay
144ee3c489 Servers Hub Fixes 2024-06-04 10:54:08 +03:00
Vigers Ray
e0566ffa3e
Хаб серверов (#13) 
* Хаб серверов внутри игры

* чейнжлог
 2024-06-04 10:03:48 +03:00
VigersRay
5f10d21fa6 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Server/Administration/Commands/PlayTimeCommands.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/StationEvents/Events/BreakerFlipRule.cs
#	Content.Shared/Roles/JobPrototype.cs
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
#	Resources/Prototypes/Entities/Mobs/base.yml
#	Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Roles/Antags/traitor.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
 2024-06-04 09:41:27 +03:00
Ed
a4d1601758
Accent trait limit (#28046) 2024-06-03 14:47:06 -04:00
AJCM-git
8c10581010
Cleans up StatusIconSystem and fixing some bugs (#28270) 2024-06-03 12:12:21 -04:00
Tornado Tech
07dfefc4a2
Hiding and clearing department prototype code (#28114) 2024-06-01 19:49:34 -04:00
DrSmugleaf
19be94c9ea
Add job whitelist system (#28085) 
* Add job whitelist system

* Address reviews

* Fix name

* Apply suggestions from code review

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>

* cancinium

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2024-06-01 05:08:31 -07:00
Vigers Ray
5775d4cdef
Merge sunrise build (#2) 
* commit
 2024-05-31 02:16:18 +03:00
Repo
eb3f27526b
Fix late join & observe to de-admin admins. (#28319) 2024-05-28 14:00:42 -04:00
ShadowCommander
63c551b20d
Fix profile editor save buttons disappearing at small resolutions (#28001) 2024-05-14 14:03:06 +10:00
metalgearsloth
332f54a3ae
Lobby refactor + species loadouts support (#27576) 
* Vox stuff

* Species loadouts and lobby refactor

The control flow for lobby is all over the shop so I pulled it all up from the individual controls so now they handle the bare minimum required and LobbyUIController handles the rest.

* a

* Bulk changes

* a

* weh

* Character import / export

* finalise

* woops this stuff too

* Also datafield exporting

* comments

* Review
 2024-05-12 09:18:21 +10:00
metalgearsloth
fcd6c25242
LobbyUI fixes (#27033) 
* LobbyUI fixes

I have no idea which were bugs prior but anyway fix stuff.

* More fixes

* Test moment
 2024-04-17 12:54:54 +10:00
metalgearsloth
12766fe6e3
Loadouts redux (#25715) 
* Loadouts redux

* Loadout window mockup

* More workout

* rent

* validation

* Developments

* bcs

* More cleanup

* Rebuild working

* Fix model and loading

* obsession

* efcore

* We got a stew goin

* Cleanup

* Optional + SeniorEngineering fix

* Fixes

* Update science.yml

* add

add

* Automatic naming

* Update nukeops

* Coming together

* Right now

* stargate

* rejig the UI

* weh

* Loadouts tweaks

* Merge conflicts + ordering fix

* yerba mate

* chocolat

* More updates

* Add multi-selection support

* test

h

* fikss

* a

* add tech assistant and hazard suit

* huh

* Latest changes

* add medical loadouts

* and science

* finish security loadouts

* cargo

* service done

* added wildcards

* add command

* Move restrictions

* Finalising

* Fix existing work

* Localise next batch

* clothing fix

* Fix storage names

* review

* the scooping room

* Test fixes

* Xamlify

* Xamlify this too

* Update Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/Jobs/Security/detective.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* ben

* Margins

---------

Co-authored-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Co-authored-by: Mr. 27 <koolthunder019@gmail.com>
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
 2024-04-16 22:57:43 +10:00
Fildrance
4c87dcd3cb
fix: lobby music volume will be changed on options change without restart (also lobby music not looped anymore) (#25530) 
* fix: lobby music volume will be changed on options change without restart (also lobby music not looped anymore)

* refactor: now lobby music is part of ContentAudioSystem. Lobby playlist is used instead of single track. Client now selects next lobby soundtrack after previous finished.

* refactor: incapsulated info on current lobby track in simple record

* refactor: fixed inconsistent naming between song and soundtrack for lobbymusic

* refactor: xml-doc for LobbyPlaylistChangedEvent

* fix: inverted invalid _audio.PlayGlobal check to return only if lobby soundtrack play call failed

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
 2024-03-02 15:40:04 -05:00
KISS
920d7068e5
Fixed client console flooding with warnings on RGB color slider changes (#21333) 
added reparent bool for this kinds of unequips

Co-authored-by: Yurii Kis <yurii.kis@smartteksas.com>
 2024-01-04 21:04:11 -08:00
Repo
b212809c58
Fix: the character preview (#22106) 2023-12-03 13:05:43 +11:00
metalgearsloth
5b8f3c48c4
Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed
Content audio (#20862) 2023-10-29 14:58:23 +11:00
DrSmugleaf
4c5e7a01f1
Make the lobby AHelp button red for admins when one is received (#20390) 2023-09-21 17:40:57 +10:00
Morb
80543c322d
Rotating character preview & lobby preview change (#19741) 2023-09-12 21:57:38 -04:00
Pieter-Jan Briers
e18f731b91
Fix race condition causing some people being unable to connect. (#19920) 2023-09-08 14:52:36 -07:00
Visne
11a57be230
Remove usages of obsolete SpriteView.Sprite.set() (#19500) 2023-08-25 11:16:46 +10:00
Vordenburg
cbbed773b4
Add song name support (#18433) 2023-08-02 19:36:27 +10:00
metalgearsloth
fbf1d476f2
Component ECS (#17991) 2023-07-13 20:20:46 +10:00
metalgearsloth
68480af109
Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00
eoineoineoin
962a7736d6
Fix missing dependencies, which caused exception setting up UI (#16387) 2023-05-13 11:30:39 -04:00
metalgearsloth
1bab97a534
Remove lobby preload (#15670) 2023-04-23 13:14:25 +10:00
metalgearsloth
122350f19c
Salvage expeditions (#12745) 2023-04-20 10:43:13 +10:00
metalgearsloth
10d82afcc9
Fix lobby votes (#15342) 2023-04-12 17:39:43 +10:00
metalgearsloth
4cb3e464ac
Fix lobby votes (#15041) 2023-04-02 01:00:48 +11:00
AJCM-git
d9bacb63e7
Fixes the changelog getting squished in the lobby (#14836) 2023-03-24 17:08:49 -04:00
metalgearsloth
f3a06a0696
Add arrivals (#14755) 
* Arrivals

* More arrivals and shitty uhh preload

* cvar

* a

* clockin + maps

* shitter prevention

* Placement

* a

* cvar for tests and dev

* weh
 2023-03-22 04:29:55 -05:00
metalgearsloth
1d1059f5ea
Fix merge artifact (#14560) 2023-03-10 17:49:00 +11:00
metalgearsloth
6157dfa3c0
Salvage dungeons (#14520) 2023-03-10 16:41:22 +11:00
Flipp Syder
ec3a519a46
Store chat size (#14299) 2023-03-06 11:06:57 -08:00
Leon Friedrich
48bcd30ef9
Makes humanoid appearance component networked. (#13009) 
Fixes https://github.com/space-wizards/space-station-14/issues/12248
 2023-01-24 11:38:19 +11:00