Morb0 b704ef0d5e Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Entry/EntryPoint.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Resources/Prototypes/Entities/Clothing/Hands/gloves.yml # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-light.png # Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-unshaded.png # Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-light.png # Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-unshaded.png # Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left-unshaded.png # Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right-unshaded.png # Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-light.png # Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png		2024-05-09 13:28:43 +03:00
..
ArrivalsSystem.cs	Make station components use StationPostInitEvent (#27126)	2024-04-19 15:26:56 +10:00
DockingSignalControlSystem.cs	Dock device link port (#27646)	2024-05-06 13:59:01 +10:00
DockingSystem.cs	Fix drone console docking (#25822)	2024-03-04 16:46:45 +11:00
DockingSystem.Shuttle.cs	Fix arrivals not docking on spinning stations (#26033)	2024-03-12 23:57:35 +11:00
EmergencyShuttleSystem.Console.cs	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-27 13:24:36 +03:00
EmergencyShuttleSystem.cs	Possible fix for evac shuttle test failures (#27175)	2024-04-21 07:55:43 +10:00
RadarConsoleSystem.cs	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
ShuttleConsoleSystem.cs	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
ShuttleConsoleSystem.Drone.cs	Fix drone console docking (#25822)	2024-03-04 16:46:45 +11:00
ShuttleConsoleSystem.FTL.cs	Coordinates Disks & Shuttle FTL Travel (#23240)	2024-04-01 15:50:00 +11:00
ShuttleSystem.cs	Admin log shuttle gibbing + Make shuttle gibbing and immovable rods drop organs and correctly put player in ghost (#27114)	2024-04-20 16:27:38 +10:00
ShuttleSystem.FasterThanLight.cs	Admin log shuttle gibbing + Make shuttle gibbing and immovable rods drop organs and correctly put player in ghost (#27114)	2024-04-20 16:27:38 +10:00
ShuttleSystem.GridFill.cs	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
ShuttleSystem.IFF.cs	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
ShuttleSystem.Impact.cs	Revert "Fix chat bubbles (#25643)" (#25645)	2024-02-28 00:51:20 +11:00
SpaceGarbageSystem.cs	Salvage magnet revamp (#23119)	2024-01-04 14:25:32 +11:00
ThrusterSystem.cs	Revert "Fix turned off thrusters consume power" (#27755)	2024-05-07 20:52:18 +10:00