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
..
BotanySwabSystem.cs	Add BreakOnDropItem, update do afters, remove unnecessary declarations (#30361)	2024-08-08 13:39:46 +02:00
BotanySystem.Produce.cs	Display obvious plant mutations in examine text (#32650)	2025-04-29 00:45:10 -04:00
BotanySystem.Seed.cs	Merge remote-tracking branch 'space-wizards/master'	2025-08-23 23:10:05 +03:00
LogSystem.cs	New Feature: Kitchen spike rework (#38723)	2025-08-19 10:56:36 -07:00
MutationSystem.cs	Validate remaining ProtoId strings (#38747)	2025-07-04 22:55:45 +02:00
PlantAnalyzerSystem.cs	фикс анализатора	2025-04-12 04:11:55 +03:00
PlantHolderSystem.cs	New Feature: Kitchen spike rework (#38723)	2025-08-19 10:56:36 -07:00
SeedExtractorSystem.cs	Fix server crash when the seed extractor is used on the dev map (#33312)	2024-11-15 21:57:33 -06:00