NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 10:51:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Resources/ServerInfo/Guidebook/Service
History
Exact
Morb0 721f7bfecf Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Prototypes/Datasets/Names/ai.yml
#	Resources/Prototypes/Datasets/adjectives.yml
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
#	Resources/Prototypes/Entities/Mobs/base.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
#	SpaceStation14.sln
2024-08-28 16:40:36 +03:00
..
Bartender.xml Guidebook Updates for the Amateur Spessman (#28603) 2024-06-09 01:00:43 +02:00
Botany.xml Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-06-14 19:48:52 +03:00
Chef.xml Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-07-21 07:20:43 +03:00
FoodRecipes.xml Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-08-28 16:40:36 +03:00
Janitorial.xml Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-02-03 03:38:29 +03:00
Service.xml Guidebook Updates for the Amateur Spessman (#28603) 2024-06-09 01:00:43 +02:00