Morb0 804c99fcc5 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Shared/CCVar/CCVars.cs # Resources/Prototypes/Datasets/Names/borg.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml # Resources/Prototypes/SoundCollections/lobby.yml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/Textures/Structures/Piping/disposal.rsi/meta.json # Resources/Textures/Tiles/attributions.yml # Resources/Textures/Tiles/steel.png		2023-11-22 20:22:45 +03:00
..
AccessConfigurator.xml	Add guidebook entries for the access configurator and installing airlock security upgrades (#18983)	2023-08-13 01:19:28 -06:00
AirlockSecurity.xml	Add guidebook entries for the access configurator and installing airlock security upgrades (#18983)	2023-08-13 01:19:28 -06:00
AME.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-24 12:56:24 +03:00
Atmospherics.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-24 12:56:24 +03:00
Construction.xml	[Translate] Guidebooks additions (#1184)	2023-07-28 14:19:46 +03:00
Engineering.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-06-19 21:06:28 +03:00
Fires.xml	[Translate] Guidebooks additions (#1184)	2023-07-28 14:19:46 +03:00
NetworkConfigurator.xml	Fix guidbook formatting	2023-10-09 02:17:19 +03:00
Networking.xml	[Translate] Guidebooks (#1189)	2023-10-05 21:07:09 +03:00
PortableGenerator.xml	Portable Generator Rework (#19302)	2023-08-25 11:40:42 -07:00
Power.xml	[Translate] Guidebooks additions (#1184)	2023-07-28 14:19:46 +03:00
Shuttlecraft.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-29 05:58:14 +03:00
Singularity.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-22 20:22:45 +03:00
TEG.xml	Adds the thermo-electric generator (#18840)	2023-08-12 15:41:55 -05:00