NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-22 08:11:19 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 12
CatStation/Content.Server/Shuttles/Systems
History
Morb0 75443d7fb6 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Communications/CommunicationsConsoleSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
#	Resources/Prototypes/secret_weights.yml
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json
2023-10-11 16:56:19 +03:00
..
ArrivalsSystem.cs Move TimedDespawn to engine (#20515) 2023-09-30 14:35:32 +10:00
DockingSystem.AutoDock.cs Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
DockingSystem.cs Fix planet docking (#20104) 2023-09-13 22:06:15 +10:00
DockingSystem.Shuttle.cs Fix planet docking (#20104) 2023-09-13 22:06:15 +10:00
EmergencyShuttleSystem.Console.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-13 16:51:52 +03:00
EmergencyShuttleSystem.cs Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
RadarConsoleSystem.cs Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
ShuttleConsoleSystem.cs Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
ShuttleConsoleSystem.Drone.cs Shuttle drone improvements (#16931) 2023-05-31 11:13:02 +10:00
ShuttleSystem.cs Fix shuttle throwing (#20884) 2023-10-10 23:07:21 -04:00
ShuttleSystem.FasterThanLight.cs Fix shuttle throwing (#20884) 2023-10-10 23:07:21 -04:00
ShuttleSystem.GridFill.cs Revert "Remove most usages of obsolete TransformComponent methods (#1… (#19714) 2023-09-01 12:30:29 +10:00
ShuttleSystem.IFF.cs IFF console (#10504) 2022-08-11 11:58:44 -05:00
ShuttleSystem.Impact.cs Revert "Remove most usages of obsolete TransformComponent methods (#1… (#19714) 2023-09-01 12:30:29 +10:00
SpaceGarbageSystem.cs Remove obsolete Fixture.Body references (#16259) 2023-05-09 17:21:26 +10:00
ThrusterSystem.cs Remove lights compref (#19531) 2023-09-11 19:18:06 +10:00