Morb0 7990ca8f46 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Entities/Mobs/Player/human.yml # Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml # Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml # Resources/Prototypes/Roles/Jobs/Command/captain.yml # Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml # Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml # Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml # Resources/Prototypes/Roles/Jobs/Science/research_director.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json # Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/icon.png # Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-left.png # Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-right.png # Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/icon.png # Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-left.png # Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png # Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/icon.png # Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-left.png # Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-right.png # Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/icon.png # Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-left.png # Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-right.png # Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/icon.png # Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-left.png # Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-right.png # Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png # Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png # Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png # Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/icon.png # Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-left.png # Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-right.png # Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/icon.png # Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-left.png # Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-right.png # Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/meta.json		2024-08-08 01:38:43 +03:00
..
AdminRemarks	Improve admin message seen/dismiss state. (#26223)	2024-03-21 16:15:46 +01:00
BanList	Add role bans tab to the bans admin window (#20388)	2023-09-22 14:08:28 -07:00
BanPanel	Hiding and clearing department prototype code (#28114)	2024-06-01 19:49:34 -04:00
Bwoink	Fix Bwoink Player sorting again.... (#30580)	2024-08-02 13:58:00 -05:00
CustomControls	Fix aHelp menu sorting (#30518)	2024-07-31 11:58:31 +10:00
Logs	Remove cringe hardcodes for background (#20374)	2023-09-22 14:50:34 -05:00
ManageSolutions	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
Notes	Better admin note popups text visibility (#29909)	2024-07-12 00:03:21 +10:00
SetOutfit	Fix misc commands (#20004)	2023-09-11 15:21:52 +10:00
SpawnExplosion	Replace Matrix3 with System.Numerics.Matrix3x2 (#27443)	2024-06-02 14:07:41 +10:00
Tabs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-07-21 07:20:43 +03:00
AdminAnnounceWindow.xaml	Multiline edit everywhere (#15216)	2023-04-14 12:57:47 -07:00
AdminAnnounceWindow.xaml.cs	Multiline edit everywhere (#15216)	2023-04-14 12:57:47 -07:00
AdminMenuWindow.xaml	Fix baby jail (#29896)	2024-07-11 15:14:01 +10:00
AdminMenuWindow.xaml.cs	Fix baby jail (#29896)	2024-07-11 15:14:01 +10:00
AdminMenuWindowEui.cs	Ensure EUIs close themselves (#15860)	2023-04-29 13:16:24 +10:00
AdminUIHelpers.cs	Add confirmation to kick and respawn in the admin player actions panel (#20542)	2023-09-28 15:46:06 -07:00
PermissionsEui.cs	Update content vectors to numerics (#17759)	2023-07-08 14:08:32 +10:00