rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Prototypes/Maps
History
VigersRay d2c1a1df88 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
#	Content.Client/Power/PowerMonitoringWindow.xaml.cs
#	Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
#	Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/Ghost/Roles/GhostRoleSystem.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
#	Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
#	Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
#	Resources/Textures/Structures/Walls/mining.rsi/meta.json
2024-07-22 04:16:05 +03:00
..
Pools Train map fix (#30145) 2024-07-21 01:44:18 -06:00
arenas.yml Add Job preference tests (#28625) 2024-06-06 00:19:24 +10:00
atlas.yml Add Job preference tests (#28625) 2024-06-06 00:19:24 +10:00
bagel.yml Фиксы (#211) 2024-07-18 17:30:42 +03:00
box.yml Фиксы (#211) 2024-07-18 17:30:42 +03:00
centcomm.yml Тразитный хаб и играбельное ЦК (#51) 2024-06-09 16:39:56 +03:00
cluster.yml Фиксы (#211) 2024-07-18 17:30:42 +03:00
core.yml Фиксы (#211) 2024-07-18 17:30:42 +03:00
debug.yml Add Job preference tests (#28625) 2024-06-06 00:19:24 +10:00
europa.yml Фиксы (#211) 2024-07-18 17:30:42 +03:00
fland.yml Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-22 04:16:05 +03:00
marathon.yml Фиксы (#211) 2024-07-18 17:30:42 +03:00
meta.yml Фиксы (#211) 2024-07-18 17:30:42 +03:00
oasis.yml Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-22 04:16:05 +03:00
omega.yml Фикс ошибок (#116) 2024-06-16 22:26:40 +03:00
origin.yml Фиксы (#211) 2024-07-18 17:30:42 +03:00
packed.yml Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-22 04:16:05 +03:00
reach.yml Add Job preference tests (#28625) 2024-06-06 00:19:24 +10:00
saltern.yml Fixing Botanist role numbers in various stations - V2 (#29581) 2024-07-21 01:23:27 -06:00
salvage.yml Vegan Meatball (#24650) 2024-03-07 22:37:57 +03:00
train.yml Фиксы (#211) 2024-07-18 17:30:42 +03:00