LEVELcat 1244d80342 Merge branch 'master' of https://github.com/space-syndicate/space-station-14 into upsteam ...

# Resolved Conflicts:
#	Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
#	Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs
#	Resources/Credits/GitHub.txt
#	Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml
#	Resources/Prototypes/GameRules/events.yml

2025-04-23 01:51:58 +03:00

..

Commands

Fix lsobjectives target player logic (#36398)

2025-04-08 21:42:38 +02:00

Components

remove mind roles from EntityWhitelist (#36089)

2025-04-10 20:45:12 +10:00

Systems

Merge branch 'master' of https://github.com/space-syndicate/space-station-14 into upsteam

2025-04-23 01:51:58 +03:00

ObjectivesSystem.cs

CVar - Toggle display of round-end greentext (#35651)

2025-03-04 08:59:44 -08:00