rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Textures/Structures/Storage
History
VigersRay d2c1a1df88 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
#	Content.Client/Power/PowerMonitoringWindow.xaml.cs
#	Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
#	Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/Ghost/Roles/GhostRoleSystem.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
#	Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
#	Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
#	Resources/Textures/Structures/Walls/mining.rsi/meta.json
2024-07-22 04:16:05 +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 Locale closet sprites (#2393) 2024-07-11 15:26:29 +03:00
Crates Merge sunrise build (#2) 2024-05-31 02:16:18 +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