fish-station/Content.Server/Shuttles
Vigers Ray 7eee898afc Merge remote-tracking branch 'space-sunrise/master'
# Conflicts:
#	Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
#	Content.Client/_Sunrise/MentorHelp/MentorHelpControl.xaml.cs
#	Content.Packaging/ServerPackaging.cs
#	Content.Server/Content.Server.csproj
#	Content.Server/Entry/EntryPoint.cs
#	Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
#	Content.Server/Fax/FaxSystem.cs
#	Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleSystem.cs
#	Content.Server/_Sunrise/Biocode/Systems/BiocodeDeactivationSystem.cs
#	Content.Shared/CCVar/CCVars.Atmos.cs
#	Content.Shared/Repairable/RepairableSystem.cs
#	Content.Shared/_Sunrise/FleshCult/CauseFleshCultInfection.cs
#	Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/belt/belts.ftl
#	Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl
#	Resources/Locale/en-US/_strings/medical/components/crew-monitoring-component.ftl
#	Resources/Locale/en-US/_strings/reagents/meta/medicine.ftl
#	Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/belt/belts.ftl
#	Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/mech/mechs.ftl
#	Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl
#	Resources/Locale/ru-RU/_strings/_sunrise/markings/vulpkanin.ftl
#	Resources/Locale/ru-RU/_strings/_sunrise/mentor-help/mentor-help-ui.ftl
#	Resources/Locale/ru-RU/_strings/reagents/meta/medicine.ftl
#	Resources/Maps/Nonstations/nukieplanet.yml
#	Resources/Maps/_Sunrise/Nonstations/nukieplanet.yml
#	Resources/Prototypes/Catalog/Fills/Items/belt.yml
#	Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
#	Resources/Prototypes/Damage/containers.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
#	Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
#	Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
#	Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
#	Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
#	Resources/Prototypes/Reagents/fun.yml
#	Resources/Prototypes/Reagents/medicine.yml
#	Resources/Prototypes/Reagents/narcotics.yml
#	Resources/Prototypes/Reagents/toxins.yml
#	Resources/Prototypes/Roles/Antags/nukeops.yml
#	Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
#	Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml
#	Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
#	Resources/Prototypes/Store/currency.yml
#	Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
#	Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml
#	Resources/Prototypes/_Sunrise/Chemistry/medicine.yml
#	Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml
#	Resources/Prototypes/_Sunrise/Entities/Mobs/Player/eviltwin.yml
#	Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ghost_roles.yml
#	Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml
#	Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml
#	Resources/Prototypes/_Sunrise/Entities/Objects/Specific/NTUplink.yml
#	Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_brains.yml
#	Resources/Prototypes/_Sunrise/Entities/Objects/Tools/biocode.yml
#	Resources/Prototypes/_Sunrise/GameRules/events.yml
#	Resources/Prototypes/_Sunrise/Reagents/gases.yml
#	Resources/Prototypes/_Sunrise/Reagents/narcotics.yml
#	Resources/Prototypes/_Sunrise/Roles/Jobs/Blueshield/blueshield_officer.yml
#	Resources/Prototypes/_Sunrise/Roles/Jobs/Security/senior_officer.yml
#	Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/meta.json
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonalert.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonalertdirect.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonalertnull.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonclose.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirect.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirectlarge.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirectsmall.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirectxtrlarge.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonfar.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonmedium.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonnull.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinpointer_bloodcult.png
#	Resources/manifest.yml
2025-12-29 18:37:56 +01:00
..
Commands Replace ValidatePrototypeId uses with ProtoId or EntProtoId (#38814) 2025-07-07 21:57:05 +02:00
Components Merge remote-tracking branch 'space-sunrise/master' 2025-12-29 18:37:56 +01:00
Events Replace Matrix3 with System.Numerics.Matrix3x2 (#27443) 2024-06-02 14:07:41 +10:00
Systems Merge remote-tracking branch 'space-sunrise/master' 2025-12-29 18:37:56 +01:00
DockingConfig.cs Fix shuttle arrival visualizer (#35772) 2025-04-15 00:34:18 +10:00
DroneConsoleComponent.cs Фикс половины тестов 2025-01-06 00:09:27 +03:00