Morb0 d9142b3553 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/workflows/conflict-labeler.yml # .github/workflows/labeler-pr.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/Prototypes/Voice/disease_emotes.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-right.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-0.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json		2024-04-30 21:12:31 +03:00
..
ControlExtensions	Filtering reagents (#18211)	2023-07-26 02:05:09 -06:00
Controls	Various item status fixes/tweaks (#27267)	2024-04-25 00:01:31 +10:00
Fragments	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
RichText	Ion law visuals (#22908)	2023-12-23 23:58:02 -07:00
Screens	Corner Clothing UI (#22883)	2023-12-22 23:32:23 -07:00
Systems	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-04-30 21:12:31 +03:00
XamlExtensions	Revert "Update submodule to 175.0.0 (#21318)" (#21319)	2023-10-29 15:29:30 +11:00
BoundKeyHelpers.cs	Use different chatbox placeholder when dependent keys unbound (#22747)	2023-12-22 11:39:29 -08:00
ButtonHelpers.cs	Add ButtonHelpers and the SetButtonDisabledRecursive helper.	2021-07-29 12:55:37 +02:00
IEntityControl.cs	Improve vv /c/enthover and add keybind (#20127)	2023-09-16 14:09:51 +10:00
StatsWindow.xaml	Cargo economy balance (#11123)	2022-09-15 11:53:17 +10:00
StatsWindow.xaml.cs	Cargo economy balance (#11123)	2022-09-15 11:53:17 +10:00
StatValuesEui.cs	Cargo economy balance (#11123)	2022-09-15 11:53:17 +10:00