rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Server/Nutrition/EntitySystems
History
Vigers Ray d853b875eb Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Lobby/LobbyUIController.cs
#	Content.Client/Lobby/UI/CharacterSetupGui.xaml
#	Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs
#	Content.Server/Antag/AntagSelectionSystem.cs
#	Content.Server/GameTicking/GameTicker.Lobby.cs
#	Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
#	Content.Server/Store/Systems/StoreSystem.Ui.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Resources/Maps/_Sunrise/Shuttles/abandoned_outpost.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
2024-11-19 18:34:32 +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 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-11-13 04:35:52 +03:00
DrinkSystem.cs Several small SFX tweaks (#28897) 2024-10-16 20:38:02 -05: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 Several small SFX tweaks (#28897) 2024-10-16 20:38:02 -05: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 vape use without check if doafter cancelled (#33245) 2024-11-10 21:17:03 -06:00
TrashOnSolutionEmptySystem.cs Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084) 2024-09-02 13:26:04 +02:00
UtensilSystem.cs Fix utensils not being thrown away (#33326) 2024-11-15 21:39:19 -06:00