CatStation/Resources/Textures/Structures/Decoration
Morb0 ce4a90a054 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Loadouts/role_loadouts.yml
#	Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
#	Resources/Textures/Structures/Power/apc.rsi/base.png
#	Resources/Textures/Structures/Power/apc.rsi/broken.png
#	Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png
#	Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png
#	Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png
#	Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png
#	Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png
#	Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png
#	Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png
#	Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png
#	Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png
#	Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png
#	Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png
#	Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png
#	Resources/Textures/Structures/Power/apc.rsi/display-charging.png
#	Resources/Textures/Structures/Power/apc.rsi/display-full.png
#	Resources/Textures/Structures/Power/apc.rsi/display-lack.png
#	Resources/Textures/Structures/Power/apc.rsi/display-remote.png
#	Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
#	Resources/Textures/Structures/Power/apc.rsi/frame.png
#	Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png
#	Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png
#	Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png
#	Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png
#	Resources/Textures/Structures/Power/apc.rsi/meta.json
#	Resources/Textures/Structures/Power/apc.rsi/panel.png
#	Resources/Textures/Structures/Power/apc.rsi/static.png
2024-06-17 23:51:01 +03:00
..
banner.rsi Locale banners (#2054) 2024-04-23 06:57:56 +03:00
bonfire.rsi now with sound! (#20287) 2023-09-18 13:17:59 -06:00
cobweb.rsi Cobwebs (#19623) 2023-09-09 23:37:56 -04:00
crystal.rsi crystals drop shards and ore crab tweaks. (#20930) 2023-12-16 15:20:14 -07:00
Curtains Colourful curtains (#25684) 2024-02-29 15:25:41 -07:00
decorated_fir_tree.rsi Added a decorated fir tree and a present (#5694) 2021-12-13 13:21:15 -08:00
fireplace.rsi Automatic holiday sprites (#22929) 2023-12-24 23:52:43 -07:00
flesh_decoration.rsi More anomalies (#13766) 2023-02-06 01:03:53 -04:00
mannequin.rsi Mannequin (#29004) 2024-06-15 13:50:55 -04:00
showcase.rsi Adds banners and robot showcase (#7253) 2022-03-27 17:15:18 +11:00
statues.rsi Adds Bananium (#14663) 2023-04-29 15:38:09 +10:00