VigersRay 47cdabdaed Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Shared/StatusEffect/StatusEffectsSystem.cs # Resources/Audio/Effects/attributions.yml # Resources/Locale/en-US/_strings/anomaly/inner_anomaly.ftl # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml # Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml		2024-09-19 16:09:00 +03:00
..
Names	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-19 16:09:00 +03:00
adjectives.yml	Add codeword highlighting (#30092)	2024-08-23 11:14:38 +02:00
corporations.yml	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
criminal_records.yml	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
figurines.yml	new boxer figurine voicelines (#31382)	2024-08-24 02:10:09 +02:00
ion_storm.yml	more consistent CentComm naming (#29217)	2024-08-08 20:04:19 +10:00
news.yml	Perform CentCom-ification (#9876)	2022-07-19 21:08:24 -07:00
rat_king_commands.yml	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
story_generation.yml	Convert story generation to use LocalizedDatasets (#28402)	2024-05-30 14:49:12 +03:00
tips.yml	Localize tips (#28285)	2024-05-30 07:39:07 -04:00
verbs.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-28 19:12:01 +03:00