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
..
AnomalousResearch.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-04-19 02:54:06 +03:00
APE.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-04-19 02:54:06 +03:00
ArtifactReports.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-04-19 02:54:06 +03:00
Cyborgs.xml	Botany, survival, cyborgs guidebook translate (#1675)	2023-12-29 16:13:00 +03:00
MachineUpgrading.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-10 00:23:02 +03:00
Robotics.xml	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +03:00
ScannersAndVessels.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-04-19 02:54:06 +03:00
Science.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-18 13:22:26 +03:00
Technologies.xml	Translate Upstream #1512 (#1513)	2023-10-18 23:56:11 +03:00
TraversalDistorter.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-04-19 02:54:06 +03:00
Xenoarchaeology.xml	[Translate] Guidebooks additions (#1184)	2023-07-28 14:19:46 +03:00