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
..
Atmos/gasanalyzer.rsi	Copyright Pass/Pruning | Part 2 - Objects (#3905)	2021-04-29 18:09:14 +00:00
Chapel	Added urn (#22488)	2023-12-16 03:31:12 -07:00
Chemistry	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-10 00:23:02 +03:00
Hydroponics	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-02 23:07:58 +03:00
Janitorial	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-16 03:05:40 +03:00
Kitchen/food_carts.rsi	Add food carts (#19177)	2023-08-15 15:26:49 -07:00
Library/Equipment/books_bag.rsi	[Sprite] inhand sprites for bags (#16005)	2023-05-02 18:24:37 +10:00
Mech	vim!!!!!!11! (#15659)	2023-08-11 12:20:16 -04:00
Medical	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-10 00:23:02 +03:00
Mining	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-21 03:03:30 +03:00
Research	Wide anomaly locator (#20581)	2023-10-01 12:41:32 -04:00
Robotics	Gun cyborg module (#19629)	2024-01-08 00:03:18 +03:00
Security	Add DamagePopup, Target Entities, And Practice Laser Gun (#12317)	2022-11-06 02:32:00 +11:00
Service/vending_machine_restock.rsi	Adds vending restocks for ChefVend and Condiment Stations (#19305)	2023-10-01 16:49:10 -04:00
Syndicate/telecrystal.rsi	add saturation to TC inhand sprites (#22870)	2023-12-22 20:26:01 -07:00
Xenoarchaeology	node scanner resprite (#17609)	2023-06-24 14:20:26 +10:00