NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 02:41:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Resources/Textures/Structures/Storage
History
Exact
Morb0 3ab6d3ef71 Merge remote-tracking branch 'wizards/master' into upstream-sync 
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Content.Server/VoiceMask/VoiceMaskComponent.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Content.Server/VoiceMask/VoiceMaskerComponent.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Entities/Clothing/Masks/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Command/captain.yml
#	Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/blue_circuit.png
#	Resources/Textures/Tiles/green_circuit.png
#	Resources/Textures/Tiles/steel.png
2024-10-04 19:47:54 +03:00
..
cabinets.rsi
canister.rsi Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-02-17 12:43:04 +03:00
closet.rsi Merge remote-tracking branch 'wizards/master' into upstream-sync 2024-10-04 19:47:54 +03:00
Crates Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-17 11:57:44 +03:00
glassbox.rsi [Resprite] Some sprites glassbox (#2127) 2024-05-17 16:53:38 +03:00
morgue.rsi
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 Revert suit storage & light tube sprites (#1770) 2024-01-17 20:38:58 +03:00
tanks.rsi Recorvax things (#1740) 2024-01-15 00:06:33 +03:00
wall_locker.rsi makes closets/lockers better (#24942) 2024-03-18 21:53:13 +01:00