NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 10:51:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Resources/Textures/Structures
History
Arthur b877259791 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
2022-07-29 17:59:17 +03:00
..
cargo_telepad.rsi ECS cargo telepad and cleanup (#6450) 2022-02-15 15:01:45 +11:00
catwalk.rsi Respriting the codebase (#4820) 2021-10-15 11:58:40 +02:00
conveyor.rsi Respriting the codebase (#4820) 2021-10-15 11:58:40 +02:00
conveyor_old.rsi Respriting the codebase (#4820) 2021-10-15 11:58:40 +02:00
Decoration Hospital curtains add (#9707) 2022-07-14 06:53:17 -05:00
dispensers.rsi Respriting the codebase (#4820) 2021-10-15 11:58:40 +02:00
Doors [Resprite] Virology & Glass Maints (#327) 2022-07-23 12:49:22 +03:00
Furniture Altars add (#9678) 2022-07-15 02:17:26 -07:00
Holo Holofan Projector Upstream from Nyano (#8352) 2022-06-03 21:58:18 +10:00
Hydroponics Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
Lighting/LightPosts/small_light_post.rsi Post Light sprite fix and state (#8578) 2022-06-02 15:12:23 -05:00
Machines Food and Beverage Spawners (#9547) 2022-07-12 19:03:10 -05:00
Magic Simple Magic Spellbook System (#7823) 2022-05-29 16:29:10 +10:00
meat_spike.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
monitors.rsi Surveillance cameras (#8246) 2022-05-31 18:44:57 +10:00
Piping [Resprite] Structures (#314) 2022-07-20 01:46:32 +03:00
plastic_flaps.rsi Add buildable plastic flaps (#6583) 2022-02-21 22:01:58 -07:00
Power [Resprite] Singularity stuff (#320) 2022-07-26 20:56:02 +03:00
Shuttles New gyroscope sprite for the shuttle (#5617) 2021-12-03 20:39:17 +11:00
Storage Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-07-29 17:59:17 +03:00
Wallmounts [Resprite] Structures (#314) 2022-07-20 01:46:32 +03:00
Walls Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-07-08 20:58:22 +03:00
Windows Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-07-08 20:58:22 +03:00