Vigers Ray a5a2bbd386 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/fingerless.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json # Resources/Textures/Mobs/Aliens/Xenos/purple_snake.rsi/meta.json		2025-04-17 06:26:03 +03:00
..
Commands	Make pow3r validation logic available on release (#36075)	2025-03-25 10:02:39 -07:00
Components	Cleanup: ExtensionCableSystem (#36052)	2025-04-15 21:01:40 +02:00
EntitySystems	Merge remote-tracking branch 'space-wizards/master'	2025-04-17 00:07:59 +03:00
Events	Revert "add breakers to power batteries" (#17632)	2023-07-08 12:47:38 +10:00
Generation/Teg	Fix assert when trying to get TEG circuit component (#33071)	2025-04-16 21:36:20 -04:00
Generator	move DeviceLinking events to shared (#36307)	2025-04-05 14:20:14 +02:00
NodeGroups	Make PACMANs a little better (#24604)	2024-01-26 21:53:43 -05:00
Nodes	Portable Generator Rework (#19302)	2023-08-25 11:40:42 -07:00
Pow3r	Make pow3r validation logic available on release (#36075)	2025-03-25 10:02:39 -07:00
SMES	Remove AllComponentsOneEntityDeleteTest (#19965)	2023-09-09 19:35:05 -05:00
PowerWireAction.cs	Predict some power PowerReceiver stuff (#33834)	2025-03-10 13:00:49 +11:00
SetBatteryPercentCommand.cs	Remove all obsolete BatteryComponent method calls (#25871)	2024-03-06 16:34:50 +11:00