Vigers Ray 4c5854ea7b Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs # Resources/Audio/Machines/attributions.yml # Resources/Locale/en-US/_strings/administration/smites.ftl # Resources/Locale/en-US/_strings/reagents/frostoil.ftl # Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml # Resources/migration.yml		2025-02-04 04:18:31 +03:00
..
Names	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-30 11:33:49 +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
damage_force_say.yml	Added Pain Numbness Trait (#34538)	2025-01-27 11:34:20 +01:00
figurines.yml	new boxer figurine voicelines (#31382)	2024-08-24 02:10:09 +02:00
ion_storm.yml	Reworded the "SAY HEY LISTEN" silicon law (#34819)	2025-02-02 20:13:58 +01: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
spooky_speakers.yml	Let ghosts sometimes make certain devices say creepy things (#34368)	2025-01-11 03:48:13 +01:00
story_generation.yml	Convert story generation to use LocalizedDatasets (#28402)	2024-05-30 14:49:12 +03:00
tips.yml	Electrified doors/windoors now spark, new tips to deal with doors without access or when electrified (#34502)	2025-01-21 11:39:15 +01:00
verbs.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-28 19:12:01 +03:00