corvax-team/ss14-wl
1
0
Fork 0
mirror of https://github.com/corvax-team/ss14-wl.git synced 2026-02-15 03:31:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
lightArmorRefact
ss14-wl/Content.Shared/Administration/Events
History
Morb0 996b761d80 Merge remote-tracking branch 'wizards/master' into upstream-sync 
# Conflicts:
#	Content.Packaging/ClientPackaging.cs
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json
#	Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json
#	Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json
#	Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json
#	Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json
#	Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json
2025-01-16 13:37:26 +03:00
..
FullPlayerListEvent.cs
Cleanup the namespaces (#8132)
2022-05-13 17:59:03 +10:00
PanicBunkerChangedEvent.cs
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
2024-06-14 19:48:52 +03:00
PlayerInfoChangedEvent.cs
Namespace cleanup around Mind Roles (#30965)
2024-08-15 20:26:57 +02:00