Morb0 918f543c2c Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml # Resources/Textures/Objects/Devices/nuke.rsi/meta.json # Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json		2023-12-25 21:03:49 +03:00
..
barricades.rsi	Ports /vg/station barricade sprites & slightly buffs them (#19840)	2023-09-16 05:50:48 -07:00
cargo_telepad.rsi	Telepad revival (#16664)	2023-05-21 20:09:31 +10:00
catwalk.rsi
conveyor.rsi
conveyor_old.rsi
Decoration	Automatic holiday sprites (#22929)	2023-12-24 23:52:43 -07:00
dispensers.rsi	Improves bartending with some tweaks. (#14169)	2023-02-18 19:00:31 -06:00
Doors	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-25 21:03:49 +03:00
Furniture	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-24 20:02:16 +03:00
Holo	[Resprite] Localizations (#1361)	2023-08-24 21:54:23 +03:00
Hydroponics
Lighting/LightPosts/small_light_post.rsi	Added light post sprites (#14533)	2023-03-23 12:12:33 -04:00
Machines	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-16 03:05:40 +03:00
Magic	Simple Magic Spellbook System (#7823)	2022-05-29 16:29:10 +10:00
meat_spike.rsi	[Resprite] Kitchen (#473)	2022-10-18 20:07:05 -07:00
monitors.rsi	[QOL] Removed unnecessary delays in some old texture meta.json files (#15378)	2023-04-16 23:50:37 -06:00
Piping	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-16 03:05:40 +03:00
plastic_flaps.rsi
Power	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-24 20:02:16 +03:00
Shuttles	Fix the remaining invalid RSIs (#13113)	2022-12-20 11:49:18 -06:00
smalldispensers.rsi	Improves bartending with some tweaks. (#14169)	2023-02-18 19:00:31 -06:00
Specific	Anomaly Cores (#21306)	2023-10-31 19:20:52 -04:00
stairs.rsi	[Resprite] TG Stairs (#1472)	2023-10-01 13:26:36 +03:00
Storage	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-21 03:03:30 +03:00
Wallmounts	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-21 03:03:30 +03:00
Walls	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-21 03:03:30 +03:00
Web	Arachnid RE-REWORK (#19138)	2023-09-04 13:02:54 -07:00
Windows	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +03:00