NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 18:31:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Server/Shuttles/Systems
History
Exact
Morb0 3ab6d3ef71 Merge remote-tracking branch 'wizards/master' into upstream-sync 
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Content.Server/VoiceMask/VoiceMaskComponent.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Content.Server/VoiceMask/VoiceMaskerComponent.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Entities/Clothing/Masks/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Command/captain.yml
#	Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/blue_circuit.png
#	Resources/Textures/Tiles/green_circuit.png
#	Resources/Textures/Tiles/steel.png
2024-10-04 19:47:54 +03:00
..
ArrivalsSystem.cs Fix latejoins (#32093) 2024-09-12 14:04:48 +10:00
DockingSignalControlSystem.cs Dock device link port (#27646) 2024-05-06 13:59:01 +10:00
DockingSystem.cs Replace obsolete code in shuttle systems. (#31408) 2024-08-26 17:48:37 +02:00
DockingSystem.Shuttle.cs Extend shuttle dock time if the shuttle doesn't dock at evac. (#31496) 2024-09-09 20:10:28 +02:00
EmergencyShuttleSystem.Console.cs Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-08-28 16:40:36 +03:00
EmergencyShuttleSystem.cs Extend shuttle dock time if the shuttle doesn't dock at evac. (#31496) 2024-09-09 20:10:28 +02:00
RadarConsoleSystem.cs fix and buff the handheld mass scanner (#31284) 2024-08-21 12:33:01 -06:00
ShuttleConsoleSystem.cs Replace obsolete code in shuttle systems. (#31408) 2024-08-26 17:48:37 +02:00
ShuttleConsoleSystem.Drone.cs Fix replayghost spawning location (#30252) 2024-07-22 20:32:30 +01:00
ShuttleConsoleSystem.FTL.cs Two additional checks to prevent FTLing stations (#32558) 2024-10-04 12:55:36 +10:00
ShuttleSystem.cs Replace obsolete code in shuttle systems. (#31408) 2024-08-26 17:48:37 +02:00
ShuttleSystem.FasterThanLight.cs Two additional checks to prevent FTLing stations (#32558) 2024-10-04 12:55:36 +10:00
ShuttleSystem.GridFill.cs Replace obsolete code in shuttle systems. (#31408) 2024-08-26 17:48:37 +02:00
ShuttleSystem.IFF.cs Fix VGRoid grid spam (#29946) 2024-07-27 11:54:38 +10:00
ShuttleSystem.Impact.cs Replace obsolete code in shuttle systems. (#31408) 2024-08-26 17:48:37 +02:00
SpaceGarbageSystem.cs Salvage magnet revamp (#23119) 2024-01-04 14:25:32 +11:00
StationAnchorSystem.cs Station Anchor (#26098) 2024-08-31 10:40:28 -04:00
ThrusterSystem.cs Replace obsolete code in shuttle systems. (#31408) 2024-08-26 17:48:37 +02:00