Vigers Ray 252e81c728 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs # Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs # Content.Server/Mindshield/MindShieldSystem.cs # Content.Shared/Gravity/SharedGravitySystem.cs # Content.Shared/Implants/SharedSubdermalImplantSystem.cs # Resources/Locale/en-US/_strings/traits/traits.ftl # Resources/Prototypes/Entities/Clothing/Shoes/misc.yml # Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml # Resources/Prototypes/Entities/Objects/Misc/implanters.yml # Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml # Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml # Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml # Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json		2025-08-23 23:10:05 +03:00
..
Components	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
Events	Merge remote-tracking branch 'space-wizards/master'	2025-08-23 23:10:05 +03:00
BasicStationEventSchedulerSystem.cs	Cleanup warnings in BasicStationEventSchedulerSystem (#37818)	2025-05-25 14:27:47 -04:00
EventManagerSystem.cs	Merge remote-tracking branch 'space-wizards/master'	2025-04-19 00:46:30 +03:00
RampingStationEventSchedulerSystem.cs	refactor event schedulers to use explicit game rules (#29320)	2024-08-14 15:21:01 +10:00