rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Shared/Materials
History
VigersRay b1cac7e781 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Chat/Managers/IChatManager.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Server/Administration/Systems/BwoinkSystem.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Resources/Audio/Machines/attributions.yml
#	Resources/Locale/en-US/_strings/administration/commands/custom-vote-command.ftl
#	Resources/Locale/en-US/_strings/discord/vote-notifications.ftl
#	Resources/Locale/en-US/_strings/npc/firebot.ftl
#	Resources/Locale/en-US/_strings/paper/syndicate-business-card.ftl
#	Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
#	Resources/Prototypes/Recipes/Crafting/bots.yml
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
2024-10-02 06:45:10 +03:00
..
ActiveMaterialReclaimerComponent.cs Use new ComponentPauseGenerator (#25183) 2024-02-26 14:36:19 +11:00
CollideMaterialReclaimerComponent.cs Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
InsertingMaterialStorageComponent.cs Use new ComponentPauseGenerator (#25183) 2024-02-26 14:36:19 +11:00
MaterialComponent.cs Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
MaterialPrototype.cs Makes machine parts stackable, removes unused field in stack prototypes (#28434) 2024-06-01 13:49:28 -04:00
MaterialReclaimerComponent.cs Returned functionality to industrial reagent grinders (#31903) 2024-09-07 17:47:02 -06:00
MaterialStorageComponent.cs Make the material ejection control completely generic (#23308) 2023-12-31 23:16:25 -08:00
PhysicalCompositionComponent.cs Allow solutions to store extra reagent data (#19323) 2023-09-05 07:55:10 +10:00
SharedMaterialReclaimerSystem.cs Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-08-22 06:50:04 +03:00
SharedMaterialStorageSystem.cs Seismic charge now craftable (#32459) 2024-10-01 20:56:49 -06:00