rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Textures/Structures/Storage
History
Vigers Ray d853b875eb Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Lobby/LobbyUIController.cs
#	Content.Client/Lobby/UI/CharacterSetupGui.xaml
#	Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs
#	Content.Server/Antag/AntagSelectionSystem.cs
#	Content.Server/GameTicking/GameTicker.Lobby.cs
#	Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
#	Content.Server/Store/Systems/StoreSystem.Ui.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Resources/Maps/_Sunrise/Shuttles/abandoned_outpost.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	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
2024-11-19 18:34:32 +03:00
..
cabinets.rsi Filing Cabinet Resprites (#8043) 2022-05-09 17:46:23 -07:00
canister.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
closet.rsi Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-09-26 20:17:14 +03:00
closet_labels.rsi Adds paper label visuals to closets and lockers (#33318) 2024-11-16 21:27:29 -06:00
Crates Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-11-19 18:34:32 +03:00
glassbox.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
morgue.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
orebox.rsi Ore boxes (#19838) 2023-09-16 21:49:54 +10:00
Shelfs The Shelfs Update (#27858) 2024-07-21 11:16:58 -06:00
suit_storage.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
tanks.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
wall_locker.rsi makes closets/lockers better (#24942) 2024-03-18 21:53:13 +01:00