rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Server/Nutrition/EntitySystems
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
..
AnimalHusbandrySystem.cs Add a system for modifying entity names without causing conflicts (#27863) 2024-06-16 15:38:53 -04:00
CreamPieSystem.cs upstream 2024-09-16 12:40:23 +03:00
DrinkSystem.cs Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084) 2024-09-02 13:26:04 +02:00
FatExtractorSystem.cs Power stuff (#31314) 2024-08-25 22:18:42 +10:00
FlavorProfileSystem.cs Revert 'Revert 'Solution Entities'' (#23168) 2023-12-29 08:47:43 -04:00
FoodSequenceSystem.cs Add extradimensional orange, holymelon, meatwheat, worldpeas mutations (#27624) 2024-09-14 00:02:54 +10:00
FoodSystem.cs Remove duplicate using from FoodSystem (#31769) 2024-09-03 08:36:53 +03:00
IngestionBlockerSystem.cs Fix masks not toggling voice mask component (#22506) 2023-12-14 20:39:11 -05:00
SliceableFoodSystem.cs Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084) 2024-09-02 13:26:04 +02:00
SmokingSystem.Cigar.cs Decouple interactions from hands, cleanup old events, add new fears (#28393) 2024-05-31 13:26:19 -07:00
SmokingSystem.cs Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084) 2024-09-02 13:26:04 +02:00
SmokingSystem.SmokingPipe.cs Update SmokingSystem.SmokingPipe.cs to not use Component.Owner (#29967) 2024-07-13 14:06:54 +10:00
SmokingSystem.Vape.cs Fix RA0032 (#32514) 2024-09-29 02:25:21 +02:00
TrashOnSolutionEmptySystem.cs Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084) 2024-09-02 13:26:04 +02:00
UtensilSystem.cs Secret stash refractor (#29396) 2024-08-09 09:51:58 +10:00