Morb0 1e0bee212f Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/workflows/publish.yml # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Maps/barratry.yml # Resources/ServerInfo/Gameplay.txt # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Engineering/Power.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Jobs.xml # Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml # Resources/Textures/Clothing/Mask/bat.rsi/meta.json # Resources/Textures/Clothing/Mask/bear.rsi/meta.json # Resources/Textures/Clothing/Mask/bee.rsi/meta.json # Resources/Textures/Clothing/Mask/breath.rsi/meta.json # Resources/Textures/Clothing/Mask/clown.rsi/meta.json # Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json # Resources/Textures/Clothing/Mask/ert.rsi/meta.json # Resources/Textures/Clothing/Mask/fox.rsi/meta.json # Resources/Textures/Clothing/Mask/gas.rsi/meta.json # Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json # Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json # Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json # Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json # Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json # Resources/Textures/Clothing/Mask/jackal.rsi/meta.json # Resources/Textures/Clothing/Mask/joy.rsi/meta.json # Resources/Textures/Clothing/Mask/medical.rsi/meta.json # Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json # Resources/Textures/Clothing/Mask/merc.rsi/meta.json # Resources/Textures/Clothing/Mask/mime.rsi/meta.json # Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json # Resources/Textures/Clothing/Mask/rat.rsi/meta.json # Resources/Textures/Clothing/Mask/raven.rsi/meta.json # Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json # Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json # Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json # Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json # Resources/Textures/Clothing/Mask/squadron.rsi/meta.json # Resources/Textures/Clothing/Mask/sterile.rsi/meta.json # Resources/Textures/Clothing/Mask/swat.rsi/meta.json		2024-01-10 00:23:02 +03:00
..
Actions	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-05 00:55:19 +03:00
AdminActions	Adds the super speed smite (#10707)	2022-08-23 09:04:17 -05:00
AdminNotes	Better notes and bans (#14228)	2023-07-21 13:38:52 +02:00
Alerts	Update health4.png skull	2024-01-03 13:41:55 +03:00
Changelog	Make + and - in changelog look less blurry.	2021-10-31 15:04:19 +01:00
Clockwork	Corner Clothing UI (#22883)	2023-12-22 23:32:23 -07:00
Default	Corner Clothing UI (#22883)	2023-12-22 23:32:23 -07:00
Eris/Slots	Corner Clothing UI (#22883)	2023-12-22 23:32:23 -07:00
Inventory	Move slot UI files around (#11282)	2022-09-14 17:13:28 -07:00
ItemStatus/Bullets	Add IItemStatus to some weapon types (#1879)	2020-08-24 13:13:26 +02:00
Minimalist	Corner Clothing UI (#22883)	2023-12-22 23:32:23 -07:00
Misc	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-10 00:23:02 +03:00
Nano	Minor visual fixups from StyleboxTexture scaling (#17763)	2023-07-09 04:57:47 +10:00
NavMap	Power monitoring console overhaul (#20927)	2023-12-24 17:07:41 +11:00
Paper	Improve paper stamping experience (#17135)	2023-08-13 14:28:10 -04:00
Plasmafire	Corner Clothing UI (#22883)	2023-12-22 23:32:23 -07:00
PowerMonitoring	Power monitoring console overhaul (#20927)	2023-12-24 17:07:41 +11:00
Retro	Corner Clothing UI (#22883)	2023-12-22 23:32:23 -07:00
Slimecore	Corner Clothing UI (#22883)	2023-12-22 23:32:23 -07:00
VerbIcons	Add an icon to the flip verb (#14358)	2023-03-05 00:36:09 +00:00
WireHacking	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
character.svg	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
character.svg.192dpi.png	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
character.svg.192dpi.png.yml	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
eject.png	PDA UI refactor and cartridges (#11335)	2022-11-08 14:00:20 -06:00
examine-star.png	Examine Groups (#12400)	2022-12-19 20:53:36 -06:00
examine-star.png.yml	Examine Groups (#12400)	2022-12-19 20:53:36 -06:00
fist.svg	Improved top menu (#2949)	2021-01-09 15:40:07 +11:00
fist.svg.192dpi.png	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
fist.svg.192dpi.png.yml	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
gavel.svg	Improved top menu (#2949)	2021-01-09 15:40:07 +11:00
gavel.svg.192dpi.png	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
gavel.svg.192dpi.png.yml	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
hamburger.svg	Improved top menu (#2949)	2021-01-09 15:40:07 +11:00
hamburger.svg.192dpi.png	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
hamburger.svg.192dpi.png.yml	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
hammer.svg	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
hammer.svg.192dpi.png	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
hammer.svg.192dpi.png.yml	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
hammer_sca;ed.svg.192dpi.png.yml	Add Alt-click functionality (#4497)	2021-08-21 10:20:18 -07:00
hammer_scaled.svg	Add Alt-click functionality (#4497)	2021-08-21 10:20:18 -07:00
hammer_scaled.svg.192dpi.png	Add Alt-click functionality (#4497)	2021-08-21 10:20:18 -07:00
handsbox.png	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
handsbox.png.yml	Enable bilinear filtering on some UI icons.	2021-01-13 03:39:07 +01:00
home.png	PDA UI refactor and cartridges (#11335)	2022-11-08 14:00:20 -06:00
home.svg	PDA UI refactor and cartridges (#11335)	2022-11-08 14:00:20 -06:00
info.svg	Adds server rules (#3475)	2021-03-03 17:56:52 +11:00
info.svg.192dpi.png	Adds server rules (#3475)	2021-03-03 17:56:52 +11:00
info.svg.192dpi.png.yml	Adds server rules (#3475)	2021-03-03 17:56:52 +11:00
inventory.svg	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
inventory.svg.192dpi.png	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
inventory.svg.192dpi.png.yml	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
light.png	PDA UI refactor and cartridges (#11335)	2022-11-08 14:00:20 -06:00
pai.png	Adding PAI Slot to PDA (#21086)	2024-01-04 05:56:14 -07:00
pencil.png	PDA UI refactor and cartridges (#11335)	2022-11-08 14:00:20 -06:00
pencil.svg	PDA UI refactor and cartridges (#11335)	2022-11-08 14:00:20 -06:00
pray.svg	Prayers Again (#10960)	2022-11-08 15:02:14 -06:00
pray.svg.png	Prayers Again (#10960)	2022-11-08 15:02:14 -06:00
pray.svg.png.yml	Prayers Again (#10960)	2022-11-08 15:02:14 -06:00
sandbox.svg	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
sandbox.svg.192dpi.png	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
sandbox.svg.192dpi.png.yml	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
students-cap.svg	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
students-cap.svg.192dpi.png	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
students-cap.svg.192dpi.png.yml	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
target-doll-high.svg	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
target-doll-high.svg.96dpi.png	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
target-doll-high.svg.96dpi.png.yml	Enable bilinear filtering on some UI icons.	2021-01-13 03:39:07 +01:00
target-doll-high.svg.192dpi.png	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
target-doll-high.svg.192dpi.png.yml	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
target-doll-low.svg	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
target-doll-low.svg.96dpi.png	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
target-doll-low.svg.96dpi.png.yml	Enable bilinear filtering on some UI icons.	2021-01-13 03:39:07 +01:00
target-doll-low.svg.192dpi.png	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
target-doll-low.svg.192dpi.png.yml	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
target-doll-middle.svg	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
target-doll-middle.svg.96dpi.png	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
target-doll-middle.svg.96dpi.png.yml	Enable bilinear filtering on some UI icons.	2021-01-13 03:39:07 +01:00
target-doll-middle.svg.192dpi.png	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
target-doll-middle.svg.192dpi.png.yml	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
target-doll.svg	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
target-doll.svg.192dpi.png	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00
target-doll.svg.192dpi.png.yml	Crisp double scale icons for top button bar.	2021-01-15 11:49:57 +01:00