Vigers Ray 38889342ad Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs # Content.Server/Chemistry/EntitySystems/InjectorSystem.cs # Content.Shared/Weapons/Ranged/Components/GunComponent.cs # Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs # Resources/Audio/Machines/attributions.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml # Resources/Prototypes/Recipes/Lathes/medical.yml # Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml # Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml # Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json # Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png # Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png # Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json # Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png # Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png # Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json		2024-11-13 04:35:52 +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	Secret stash refractor (#29396)	2024-08-09 09:51:58 +10:00