Vigers Ray 1b61551b4d Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/GameTicking/GameTicker.StatusShell.cs # Content.Server/Implants/SubdermalImplantSystem.cs # Content.Server/Silicons/Borgs/BorgSystem.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Locale/en-US/_strings/advertisements/vending/smite.ftl # Resources/Maps/_Sunrise/Shuttles/wrecklaimer.yml # Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml		2025-01-16 20:00:41 +03:00
..
Pools	Plasma Station (#33991)	2025-01-16 00:02:14 -07:00
amber.yml	Amber Station - Added Evac Shuttle (#33743)	2024-12-06 01:39:25 -07:00
arenas.yml	Add Job preference tests (#28625)	2024-06-06 00:19:24 +10:00
bagel.yml	let bagel be played at max pop (#33769)	2024-12-07 14:24:16 -07:00
box.yml	boxstation AI update (#31771)	2024-09-03 00:29:26 -06:00
centcomm.yml	Тразитный хаб и играбельное ЦК (#51)	2024-06-09 16:39:56 +03:00
cog.yml	Updated cog (Maints edition) (#31935)	2024-09-07 13:58:16 -06:00
core.yml	Update Core (#31774)	2024-09-03 00:46:47 -06:00
debug.yml	Add Job preference tests (#28625)	2024-06-06 00:19:24 +10:00
elkridge.yml	Elkridge Depot (The station formerly known as Cell) (#34085)	2025-01-03 12:32:46 -07:00
fland.yml	Fland Reporters Room (#34408)	2025-01-12 16:32:50 -07:00
gate.yml	Увы	2024-12-23 20:58:07 +03:00
loop.yml	Loop Station Decal and maints additions (#34103)	2024-12-30 13:07:00 -07:00
marathon.yml	marathon update (#31804)	2024-09-03 14:06:00 -06:00
meta.yml	Meta station overhaul (#33506)	2024-12-31 15:54:57 -07:00
oasis.yml	upstream	2024-09-16 12:40:23 +03:00
omega.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-21 06:29:09 +03:00
packed.yml	Packed Update (Remove Christmas & New Evac) (#34168)	2025-01-01 16:50:35 -07:00
plasma.yml	Plasma station population tweak (#34462)	2025-01-16 01:51:17 -07:00
reach.yml	Adds a salvage jobspawn to reach (#31712)	2024-09-01 22:37:02 -06:00
saltern.yml	Fixing Botanist role numbers in various stations - V2 (#29581)	2024-07-21 01:23:27 -06:00
salvage.yml	anonymize salvage wrecks (#31087)	2024-08-17 15:09:21 +10:00
train.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-17 17:27:37 +03:00