NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-13 12:21:11 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Resources/Textures/Structures/Furniture
History
Exact
Morb0 a0bce916fb Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
#	Resources/Prototypes/Guidebook/rules.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/origin.yml
2024-08-16 14:29:08 +03:00
..
Altars Adds Bananium (#14663) 2023-04-29 15:38:09 +10:00
Bench/comf_bench.rsi Solo bench (#24203) 2024-01-23 17:15:48 -05:00
bookshelf.rsi New sprites for books on bookshelves in order to look less sad. (#22874) 2023-12-23 00:34:19 -05:00
Carpets Changed black carpet texture to correctly align itself. (#26358) 2024-03-23 11:39:40 +03:00
chairs.rsi Remove CRLF, enforce with workflow (#26401) 2024-03-24 22:06:17 +01:00
folding_chair.rsi Folding Chairs (#11398) 2022-09-18 12:47:31 -05:00
furniture.rsi Fix wooden counter sprites (#2305) 2024-06-20 18:30:05 +02:00
golden_toilet.rsi Golden toilet (#31049) 2024-08-15 13:23:59 -06:00
Memorials Add credit to Tomb of the Unknown Employee sprite (#13652) 2023-01-22 17:57:08 -08:00
potted_plants.rsi New plant (#22704) 2023-12-19 21:57:02 -07:00
rollerbeds.rsi
sink.rsi make the smaller sinks look good again (#19198) 2023-08-15 23:44:14 -06:00
Tables Fix wooden counter sprites (#2305) 2024-06-20 18:30:05 +02:00
toilet.rsi Golden toilet (#31049) 2024-08-15 13:23:59 -06:00