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
..
Materials	Респрайт аплинка и телекристаллов (#2246)	2025-06-02 22:00:11 +03:00
consumable_stacks.yml	Localizable craftmenu (#32339)	2025-05-01 10:21:16 -04:00
engineering_stacks.yml	Localizable craftmenu (#32339)	2025-05-01 10:21:16 -04:00
floor_tile_stacks.yml	Merge remote-tracking branch 'space-wizards/master'	2025-08-23 23:10:05 +03:00
medical_stacks.yml	Localizable craftmenu (#32339)	2025-05-01 10:21:16 -04:00
power_stacks.yml	Localizable craftmenu (#32339)	2025-05-01 10:21:16 -04:00
science_stacks.yml	Fix crafting steps with modular machine parts (#38299)	2025-06-12 22:21:57 -07:00