rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/ServerInfo/Guidebook/Engineering
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
..
AccessConfigurator.xml Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
AirlockSecurity.xml Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
AME.xml Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
Atmospherics.xml Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
Construction.xml Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
Engineering.xml Guidebook Updates for the Amateur Spessman (#28603) 2024-06-09 01:00:43 +02:00
Fires.xml Override under-pressure lock-out in air alarm "Fill" mode (#28909) 2024-06-13 15:25:02 -08:00
NetworkConfigurator.xml Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
Networking.xml Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
PortableGenerator.xml Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
Power.xml Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
RTG.xml Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
Shuttlecraft.xml Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
Singularity.xml Ports the singularity's values from vgstation (#28720) 2024-06-07 22:15:13 -04:00
TEG.xml Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-22 04:16:05 +03:00