mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-02-15 03:50:54 +01:00
fa377d8fc6
# Conflicts: # .github/labeler.yml # Content.Client/Lobby/UI/CharacterSetupGui.xaml # Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/ServerInfo/Guidebook/Science/Cyborgs.xml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json # Resources/Textures/Structures/Windows/mining.rsi/full.png # Resources/Textures/Structures/Windows/mining.rsi/meta.json # Resources/Textures/Structures/Windows/mining.rsi/mwindow0.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow1.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow2.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow3.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow4.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow5.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow6.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow7.png # Resources/Textures/Structures/Windows/mining_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/mining_diagonal.rsi/state1.png # Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json # Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png # Resources/Textures/Structures/Windows/plasma_window.rsi/full.png # Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png # Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json # Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png # Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/meta.json # Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png # Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json # Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png # Resources/Textures/Structures/Windows/tinted_window.rsi/full.png # Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png # Resources/Textures/Structures/Windows/uranium_window.rsi/full.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png # Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json # Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png # Resources/Textures/Structures/Windows/window.rsi/full.png # Resources/Textures/Structures/Windows/window.rsi/meta.json # Resources/Textures/Structures/Windows/window.rsi/window0.png # Resources/Textures/Structures/Windows/window.rsi/window1.png # Resources/Textures/Structures/Windows/window.rsi/window2.png # Resources/Textures/Structures/Windows/window.rsi/window3.png # Resources/Textures/Structures/Windows/window.rsi/window4.png # Resources/Textures/Structures/Windows/window.rsi/window5.png # Resources/Textures/Structures/Windows/window.rsi/window6.png # Resources/Textures/Structures/Windows/window.rsi/window7.png # Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json # Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png # Resources/migration.yml