rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Prototypes/Maps
History
Vigers Ray 10888fd269 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/GameTicking/Managers/ClientGameTicker.cs
#	Content.Server/Administration/Systems/BwoinkSystem.cs
#	Content.Server/Cargo/Systems/CargoSystem.Orders.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Power/EntitySystems/PowerNetSystem.cs
#	Content.Server/Shuttles/Systems/ArrivalsSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/StationEvents/Components/PowerGridCheckRuleComponent.cs
#	Content.Server/StationEvents/Events/PowerGridCheckRule.cs
#	Content.Server/Zombies/ZombieSystem.Transform.cs
#	Content.Shared/CCVar/CCVars.Game.cs
#	Content.Shared/GameTicking/SharedGameTicker.cs
#	Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-wizard.ftl
#	Resources/Locale/en-US/_strings/guidebook/cooking.ftl
#	Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
#	Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/GameRules/midround.yml
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Prototypes/Guidebook/antagonist.yml
#	Resources/ServerInfo/Guidebook/Jobs.xml
#	Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
#	Resources/migration.yml
2025-02-26 22:01:48 +03:00
..
Pools Removes Cog station (#34996) 2025-02-09 14:01:31 -07:00
amber.yml Amber Station Improvements (#35384) 2025-02-23 01:31:04 -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 Refactor map loading & saving 2024-12-23 02:42:17 +13: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 Tweaks 2 (#34757) 2025-02-09 18:07:10 -07:00
fland.yml Fland Armory Restock (#35044) 2025-02-10 13:45:42 -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
Relic.yml Custom arrivals shuttle for Relic (#35194) 2025-02-24 14:35:41 -07: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