rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Textures/Structures/Windows
History
Vigers Ray 8ae86bf691 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Shared/CCVar/CCVars.cs
#	Resources/Prototypes/Polymorphs/polymorph.yml
#	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/meta.json
#	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/plastitanium_window.rsi/full.png
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/meta.json
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow0.png
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow1.png
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow2.png
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow3.png
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow4.png
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow5.png
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow6.png
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow7.png
#	Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/meta.json
#	Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state0.png
#	Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state1.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/meta.json
#	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/shuttle_window.rsi/full.png
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/meta.json
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow0.png
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow1.png
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow2.png
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow3.png
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow4.png
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow5.png
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow6.png
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow7.png
#	Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/meta.json
#	Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/state0.png
#	Resources/Textures/Structures/Windows/shuttle_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/meta.json
#	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
2024-11-14 03:15:01 +03:00
..
clockwork_diagonal.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
clockwork_window.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
cracks.rsi Add easy window upgrading, fix some other window issues. (#31978) 2024-09-09 13:26:10 -06:00
cracks_diagonal.rsi Add easy window upgrading, fix some other window issues. (#31978) 2024-09-09 13:26:10 -06:00
cracks_directional.rsi Add easy window upgrading, fix some other window issues. (#31978) 2024-09-09 13:26:10 -06:00
directional.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
mining.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
mining_diagonal.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
plasma_diagonal.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
plasma_window.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
plastitanium_window.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
plastitanium_window_diagonal.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
reinforced_plasma_diagonal.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
reinforced_plasma_window.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
reinforced_uranium_diagonal.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
reinforced_uranium_window.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
reinforced_window.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
reinforced_window_diagonal.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
shuttle_window.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
shuttle_window_diagonal.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
tinted_window.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
uranium_window.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
uranium_window_diagonal.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
window.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00
window_diagonal.rsi Window sprite tweaks (#33282) 2024-11-13 13:30:40 +01:00