CatStation/Resources/ServerInfo/Guidebook
Morb0 d9bfc5cdcb Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Resources/Prototypes/Datasets/Names/ai.yml
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
#	Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
#	Resources/Prototypes/Maps/cog.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml
#	Resources/Prototypes/Roles/Jobs/departments.yml
#	Resources/ServerInfo/Guidebook/Security/Forensics.xml
#	Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png
#	Resources/Textures/Structures/Walls/solid.rsi/meta.json
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png
#	Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png
#	Resources/Textures/Structures/Walls/solid.rsi/solid0.png
#	Resources/Textures/Structures/Walls/solid.rsi/solid1.png
#	Resources/Textures/Structures/Walls/solid.rsi/solid2.png
#	Resources/Textures/Structures/Walls/solid.rsi/solid3.png
#	Resources/Textures/Structures/Walls/solid.rsi/solid4.png
#	Resources/Textures/Structures/Walls/solid.rsi/solid5.png
#	Resources/Textures/Structures/Walls/solid.rsi/solid6.png
#	Resources/Textures/Structures/Walls/solid.rsi/solid7.png
2024-09-11 10:56:49 +03:00
..
Antagonist Fix upstream 2024-08-23 10:00:37 +03:00
Cargo Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-06-14 19:48:52 +03:00
ChemicalTabs guide on agrichem and botanicals guidebook update (#31896) 2024-09-07 16:23:00 +10:00
Engineering Guidebook typo fixes (#31159) 2024-08-18 11:31:48 -04:00
Medical Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-09-11 10:56:49 +03:00
Mobs Fix upstream 2024-08-16 15:05:20 +03:00
NewPlayer Guidebook typo fixes (#31159) 2024-08-18 11:31:48 -04:00
ReferenceTables Guidebook Updates for the Amateur Spessman (#28603) 2024-06-09 01:00:43 +02:00
Science Guidebook typo fixes (#31159) 2024-08-18 11:31:48 -04:00
Security Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-09-11 10:56:49 +03:00
ServerRules clarify what is an important role in rule 12 (#30818) 2024-08-18 21:39:45 -06:00
Service Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-08-28 16:40:36 +03:00
Chemicals.xml Guidebook locale (#1393) 2023-09-07 16:07:33 +03:00
Command.xml Guidebook Updates for the Amateur Spessman (#28603) 2024-06-09 01:00:43 +02:00
Glossary.xml Guidebook typo fixes (#31159) 2024-08-18 11:31:48 -04:00
Jobs.xml Guidebook Updates for the Amateur Spessman (#28603) 2024-06-09 01:00:43 +02:00
References.xml Guidebook Updates for the Amateur Spessman (#28603) 2024-06-09 01:00:43 +02:00
SpaceStation14.xml new station and shifts guide (#28799) 2024-06-09 14:03:47 -04:00
Survival.xml Guidebook typo fixes (#31159) 2024-08-18 11:31:48 -04:00
Writing.xml Translate Upstream #1362 (#1366) 2023-08-27 04:45:39 +03:00