fish-station/Resources/Prototypes/Maps
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
..
Pools New Highpop map: Convex recreational complex (#33346) 2025-01-29 19:44:45 -07:00
amber.yml Amber Station Changes (#34656) 2025-01-26 23:30: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 Box Armory Restock (#34750) 2025-01-31 00:23:03 -07: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
convex.yml New Highpop map: Convex recreational complex (#33346) 2025-01-29 19:44:45 -07: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 reworking chem and adding psychology to loop (#34749) 2025-01-29 15:07:46 -07:00
marathon.yml Marathon Armory Restock (#34798) 2025-01-31 23:32:41 -07:00
meta.yml Meta Station - Armory restock + fixes (#34717) 2025-01-31 00:22:52 -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 Armory Packed update. (#34808) 2025-02-01 14:19:28 -07:00
plasma.yml Plasma station patch 1 (#34602) 2025-01-27 00:07:44 -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