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

63 commits

Author SHA1 Message Date
VigersRay
c8e9b7bbf4 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Server/Roles/RoleSystem.cs
#	Content.Server/Silicons/Laws/SiliconLawSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Entities/Objects/Fun/pai.yml
#	Resources/Prototypes/GameRules/midround.yml
#	RobustToolbox
 2024-10-10 19:09:17 +03:00
Errant
93c7bdc134
Mind Role Entities (#31318) 
* Mind Role Entities wip

* headrev count fix

* silicon stuff, cleanup

* exclusive antag config, cleanup

* jobroleadd overwerite

* logging stuff

* MindHasRole cleanup, admin log stuff

* last second cleanup

* ocd

* minor cleanup

* remove createdTime datafield

* now actually using the event replacement I made for role time tracking

* weh
 2024-10-10 10:48:56 +02:00
VigersRay
2a523b73d3 Ну а чо я? Я ничо 2024-10-02 06:33:00 +03:00
VigersRay
aa38c32b65 upstream 2024-09-16 12:40:23 +03:00
nikthechampiongr
ee434e397d
Rename fix (#31654) 
* Localize RenameCommand and delegate most of the process to MetaDataSystem.SetEntityName()

* Make renaming rely on the EntityRenamedEvent. Fix issue where renaming would keep old Examine text

Requires engine change

* Fix localisation strings

* Make PDA search be based on a renamed entity's Uid instead of its old name

To do this the pda component now has an PdaOwner field which gets
assigned when it is given as a loadout to a player

* Fix bad merge???

huh

* Use AllEntityQuery
 2024-09-15 11:55:03 +10:00
Mervill
3414abb970
Remove unused IoC dependency references. (#31704) 
Remove unused IoC dependencies
 2024-09-01 23:22:50 +02:00
VigersRay
c705713fb0 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
#	Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json
#	Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json
#	Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json
 2024-08-29 16:01:10 +03:00
metalgearsloth
f0615ec3c8
Fixup playerspawn stuff (#31546) 
* Fixup playerspawn stuff

- Also removed arrivals forcing, this should just turn containerspawnpoint off.

* fix this one

* test fix

* really fix
 2024-08-29 15:27:47 +10:00
VigersRay
6b134a0888 Фиксы апстрима 2024-08-28 20:17:03 +03:00
VigersRay
9328f4d9cb Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Shuttles/Systems/ArrivalsSystem.cs
#	Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Shared/Chat/SharedChatSystem.cs
#	Content.Shared/UserInterface/ActivatableUIComponent.cs
#	Resources/Prototypes/Datasets/Names/ai.yml
#	Resources/Prototypes/Datasets/adjectives.yml
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Roles/Jobs/Science/borg.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
#	SpaceStation14.sln
 2024-08-28 19:12:01 +03:00
metalgearsloth
afd0618a60
Station AI (#30944) 
* Station AI overlay

* implement

* Bunch of ports

* Fix a heap of bugs and basic scouting

* helldivers

* Shuffle interactions a bit

* navmap stuff

* Revert "navmap stuff"

This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062.

* AI wires implemented

* Fix examines

* Optimise the overlay significantly

* Back to old static

* BUI radial working

* lots of work

* Saving work

* thanks fork

* alright

* pc

* AI upload console

* AI upload

* stuff

* Fix copy-paste shitcode

* AI actions

* navmap work

* Fixes

* first impressions

* a

* reh

* Revert "navmap work"

This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e.

# Conflicts:
#	Content.Client/Silicons/StationAi/StationAiOverlay.cs

* OD

* radar

* weh

* Fix examines

* scoop mine eyes

* fixes

* reh

* Optimise

* Final round of optimisations

* Fixes

* fixes
 2024-08-28 10:57:12 +10:00
VigersRay
ff394987f4 Обнова спонсорки 2024-07-01 17:03:24 +03:00
VigersRay
2b29ccb77e удалил StartingGear из SpeciesPrototype 2024-06-21 05:11:45 +03:00
VigersRay
979e2996b9 Фиксы лоадаута в апстриме. Фикс установки стандартного лоадаута при наличиии ограничений по расе/гендеру 2024-06-15 22:05:48 +03: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
metalgearsloth
8f12e90b90
Don't use invalid defaults for loadouts (#28740) 
* Don't use invalid defaults for loadouts

At the time it made more sense but now with species specific stuff it's better to have nothing.

* Loadout SetDefault only applies valid loadouts
 2024-06-15 16:53:42 +10:00
VigersRay
562dc416a2 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Server/Construction/ConstructionSystem.Initial.cs
#	Resources/ServerInfo/Guidebook/Engineering/Fires.xml
 2024-06-14 19:01:52 +03:00
Hannah Giovanna Dawson
3b3163c4f4
SS-28662 Add cvars to support forcing people to departures and making those at departures invincible (#28765) 
* SS-28662 Add cvar to force spawn everyone at departures

This cvar means everyone must spawn at departures. This
could be handy for an admin event? But mostly it's so the
tutorial departures terminal can be seen by all newbies on
gateway servers.

* Small fix to ArrivalsSystem flow

* Remove incorrect todo

* Add godmode arrivals cvar
 2024-06-14 04:15:42 -07:00
Vigers Ray
2592568873 Фикс спавна в космопорту 2024-06-11 01:18:50 +03:00
Vigers Ray
4a20ecfd08 Фикс выдачи ролей антагов в прибытии 2024-06-10 20:51:38 +03:00
Vigers Ray
3e5002ec81
Тразитный хаб и играбельное ЦК (#51) 
* Тразитный хаб и играбельное ЦК

* Правки и лоадауты для ролей ЦК

* Фиксы

* приоритет для ролей ЦК

* Остальные приколы для хаба
 2024-06-09 16:39:56 +03:00
Rinary
5c82638cdb
Удаление дублей в файлах локализации (#39) 
* Vulpkanin Lang Fix

* Remove Double Added Strings in Locale(It's bad)

* More

* Food

* Organs

* End

* Merge?
 2024-06-09 00:46:26 +03:00
Vigers Ray
e838e56ca8
AlwaysUseSpawner и фикс спавна ролей без спавнеров (#20) 2024-06-05 12:08:54 +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
Mr. 27
7d22897d02
Job starting gear is now defined in the starting gear rather than backpack prototypes (#27605) 
*
 2024-06-03 19:52:15 -04:00
AJCM-git
8c10581010
Cleans up StatusIconSystem and fixing some bugs (#28270) 2024-06-03 12:12:21 -04:00
VigersRay
1b725c9db8 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
 2024-06-01 09:38:18 +03:00
Leon Friedrich
54337911d3
Only auto-enable internals when necessary (#28248) 
* Only auto-enable internals when necessary

* Add toxic gas check

* Rename Any -> AnyPositive
 2024-05-31 12:28:11 +10:00
Vigers Ray
5775d4cdef
Merge sunrise build (#2) 
* commit
 2024-05-31 02:16:18 +03:00
Ed
e522bbf90d
New event: Approaching unknown shuttle (#24490) 
* setup codebase

* Add first shuttle

* tak

* sync striker

* sync 2

* pipipi

* Preloaded roundstart shuttles!

* Make it abstract "PreloaderGrid" not "PreloaderShuttle"

* to do

* added china cuisin shuttle

* fixes

* add disaster evacpod

* remove enemy

* final shuttles

* weight 5 -> 10

* move data to component

* remove autotrailer touching

* doc, respath

* fix frozen positioning

* fixes + cvar

* finally

* fix evacpod

* remove blacklistrules

* remove `UnknownShuttleSpawnRule`, refactor `LoadMapRule` to support preloaded grids

* use tryload

* cleanup

* fixes

* use preloadedgrid for loneops

* weight unknown shuttles differently (preliminal)

* leftover

* cleanup and raffling

* partial review

* singleton gridpreloader no station coupling

* fix grid atmoses

* `roleLoadout` support for `LoadoutComponent`, fix missing gear

* weighting changes

* init logic fix

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2024-05-10 04:35:59 -07:00
Errant
f64dd5f45f
Space Ninjas auto-toggle internals after spawning (#25083) 
* fix engine version

* actually fix engine version

* Automatically activated breathing masks

* weh

* who needed that component anyway

* check if internals are already running

* Update Content.Server/Atmos/Components/BreathToolComponent.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Content.Server/Body/Systems/InternalsSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* prediction

* record struct event

* remove delayed activation, instead ensure that masks spawn last

* leftover

* engine version

* re-implement

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-05-03 11:24:21 +10:00
ShadowCommander
a95fc86f7a
Fix PDA and ID card data not getting set on loadouts (#27062) 2024-04-18 00:16:24 +02:00
metalgearsloth
9bc3e07628
Fix starting gear (#27008) 
Slight blunder on the loadout prototype being used and all the names aligning means playtesting didn't catch it earlier.

Ideally player spawning code wouldn't have sucked so I could add tests like I wanted but it is what it is.
 2024-04-17 00:44:16 +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
Pieter-Jan Briers
68ce53ae17
Random spontaneous cleanup PR (#25131) 
* Use new Subs.CVar helper

Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe.

This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown.

* Fix a bunch of warnings

* More warning fixes

* Use new DateTime serializer to get rid of ISerializationHooks in changelog code.

* Get rid of some more ISerializationHooks for enums

* And a little more

* Apply suggestions from code review

Co-authored-by: 0x6273 <0x40@keemail.me>

---------

Co-authored-by: 0x6273 <0x40@keemail.me>
 2024-02-13 16:48:39 -05:00
Krunklehorn
ed0f2aa221
Client customization late-join spawner priority for arrivals/cryostorage (#24586) 
* Initial commit, requires server restart to take effect

* Exposes callbacks directly instead, takes effect immediately

* Cleaned up control flow, swapped cvar for client customization

* Switched to int, dictionary of callbacks, migration

* Update Content.Shared/Preferences/SpawnPriorityPreference.cs

* krunkle stan

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-02-01 21:12:09 +11:00
Nemanja
71cb62e9c6
fix starting gear without PDAs (#24463) 
* fix starting gear without PDAs

* legacy as shit
 2024-01-24 11:02:24 +11:00
DrSmugleaf
dc3b6e31b2
Fix Client RoleSystem not inheriting SharedRoleSystem, network job component (#21436) 2023-11-07 14:44:53 -08:00
DrSmugleaf
3f3ba6ac62
Move minds, roles, jobs and objectives to shared (#19679) 2023-08-30 21:46:11 -07:00
DrSmugleaf
15c0211fb2
Refactor minds to be entities with components, make roles components (#19591) 
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
 2023-08-28 16:53:24 -07:00
Vordenburg
cc8b642444
Add linter-friendly WeightedRandom prototypes (#18729) 2023-08-06 12:31:25 +10:00
metalgearsloth
ead47c541d
Fix humanoid appearances for placement manager (#18291) 2023-08-05 14:25:47 +10:00
PrPleGoo
7c088ac1de
Job icons are stored on ID cards (#18233) 2023-07-29 18:25:27 +10:00
TemporalOroboros
df1dcb74ac
Dewarns access (#16666) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-07-23 14:19:51 +10:00
0x6273
247c7a1d4d
Fix PDA capitalization to be PascalCase (#17335) 2023-06-15 11:44:28 +10:00
Moony
e92a8fedab
Refactor stations to properly use entity prototypes. (stationsv3) (#16570) 
* Update StationSpawningSystem.cs

Web-edit to allow feeding in an existing entity.

* Update StationSpawningSystem.cs

value type moment

* Update StationSpawningSystem.cs

* Oh goddamnit this is a refactor now.

* awawawa

* aaaaaaaaaaa

* ee

* forgot records.

* no records? no records.

* What's in a name?

* Sloth forcing me to do the refactor properly smh.

* e

* optional evac in test.

* tests pls work

* awa

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
 2023-05-19 15:45:09 -05:00
deltanedas
44f9c098ec
uplink locking/unlocking, minor pda refactor (#15842) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-05-01 16:30:08 +10:00
DrSmugleaf
b947856431
Remove hands component reference (#15197) 2023-04-07 11:21:12 -07:00
Nemanja
66ff565e16
Add support for true randomized characters (#14918) 2023-03-28 18:30:00 -07: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