rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Textures/Structures/Storage/Crates
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
..
artifact.rsi You can now see paper on crates (with color!) (#26834) 2024-04-14 13:39:02 +10:00
cage.rsi Hamster Pet (GhostRoleMob) (#12813) 2022-12-06 15:28:05 -08:00
chemcrate_secure.rsi The Cratening (#18972) 2023-08-10 19:12:38 -05:00
coffin.rsi You can now see paper on crates (with color!) (#26834) 2024-04-14 13:39:02 +10:00
command.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
electrical.rsi The Cratening (#18972) 2023-08-10 19:12:38 -05:00
engicrate_secure.rsi engi crate recolor (#19094) 2023-08-14 00:17:07 -04:00
engineering.rsi engi crate recolor (#19094) 2023-08-14 00:17:07 -04:00
freezer.rsi ice (#18985) 2023-08-11 01:28:26 -06:00
generic.rsi The Cratening (#18972) 2023-08-10 19:12:38 -05:00
hydro_secure.rsi plastic hydro crates (#19112) 2023-08-14 02:29:01 -05:00
hydroponics.rsi plastic hydro crates (#19112) 2023-08-14 02:29:01 -05:00
labels.rsi Adds paper label visuals to closets and lockers (#33318) 2024-11-16 21:27:29 -06:00
livestock.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
medical.rsi The Cratening (#18972) 2023-08-10 19:12:38 -05:00
medicalcrate_secure.rsi The Cratening (#18972) 2023-08-10 19:12:38 -05:00
o2.rsi o2 crate recolour (#19113) 2023-08-14 02:28:53 -05:00
piratechest.rsi pirate content (#11799) 2023-04-09 22:47:40 -07:00
plasma.rsi The Cratening (#18972) 2023-08-10 19:12:38 -05:00
plastic.rsi The Cratening (#18972) 2023-08-10 19:12:38 -05:00
privatecrate_secure.rsi The Cratening (#18972) 2023-08-10 19:12:38 -05:00
radiation.rsi The Cratening (#18972) 2023-08-10 19:12:38 -05:00
scicrate_secure.rsi The Cratening (#18972) 2023-08-10 19:12:38 -05:00
science.rsi The Cratening (#18972) 2023-08-10 19:12:38 -05:00
sec_gear.rsi The Cratening (#18972) 2023-08-10 19:12:38 -05:00
secure.rsi The Cratening (#18972) 2023-08-10 19:12:38 -05:00
stone_grave.rsi coffin and two graves (#18213) 2023-07-23 21:13:10 -06:00
surgery.rsi The Cratening (#18972) 2023-08-10 19:12:38 -05:00
syndicate.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
toybox.rsi You can now see paper on crates (with color!) (#26834) 2024-04-14 13:39:02 +10:00
trashcart.rsi Add trash carts and janitorial trash carts (#18996) 2023-08-12 13:05:32 -06:00
trashcart_jani.rsi Add trash carts and janitorial trash carts (#18996) 2023-08-12 13:05:32 -06:00
weapon.rsi The Cratening (#18972) 2023-08-10 19:12:38 -05:00
web.rsi Arachnid RE-REWORK (#19138) 2023-09-04 13:02:54 -07:00
wooden_grave.rsi coffin and two graves (#18213) 2023-07-23 21:13:10 -06:00