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
..
Antagonist	Fix tiny grammar/spelling issues (#23534)	2024-01-04 23:35:31 +01:00
Cargo	Bounties, antags general, minor antags guidebook translate (#1677)	2023-12-29 16:45:28 +03:00
Controls	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-06-26 17:34:49 +03:00
Engineering	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-10 00:23:02 +03:00
Medical	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-08 13:54:31 +03:00
Science	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-10 00:23:02 +03:00
Security	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-29 16:58:52 +03:00
Service	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-10 00:23:02 +03:00
Chemicals.xml	Guidebook locale (#1393)	2023-09-07 16:07:33 +03:00
Glossary.xml	Glossary (#22840)	2023-12-22 00:25:56 -07:00
Jobs.xml	Fix tiny grammar/spelling issues (#23534)	2024-01-04 23:35:31 +01:00
SpaceStation14.xml	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-06-26 17:34:49 +03:00
Survival.xml	Botany, survival, cyborgs guidebook translate (#1675)	2023-12-29 16:13:00 +03:00
Writing.xml	Translate Upstream #1362 (#1366)	2023-08-27 04:45:39 +03:00