CatStation/Resources/Textures/Structures/Power
Morb0 d9bfc5cdcb Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Resources/Prototypes/Datasets/Names/ai.yml
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
#	Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
#	Resources/Prototypes/Maps/cog.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml
#	Resources/Prototypes/Roles/Jobs/departments.yml
#	Resources/ServerInfo/Guidebook/Security/Forensics.xml
#	Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png
#	Resources/Textures/Structures/Walls/solid.rsi/meta.json
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png
#	Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png
#	Resources/Textures/Structures/Walls/solid.rsi/solid0.png
#	Resources/Textures/Structures/Walls/solid.rsi/solid1.png
#	Resources/Textures/Structures/Walls/solid.rsi/solid2.png
#	Resources/Textures/Structures/Walls/solid.rsi/solid3.png
#	Resources/Textures/Structures/Walls/solid.rsi/solid4.png
#	Resources/Textures/Structures/Walls/solid.rsi/solid5.png
#	Resources/Textures/Structures/Walls/solid.rsi/solid6.png
#	Resources/Textures/Structures/Walls/solid.rsi/solid7.png
2024-09-11 10:56:49 +03:00
..
apc.rsi apc touchup sprite (#30460) 2024-08-02 17:19:25 +10:00
borg_charger.rsi Borgs (#18136) 2023-08-12 16:39:58 -05:00
cable_terminal.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
Cables make laid power cables more visible v2 (#32008) 2024-09-09 13:15:22 -06:00
cage_recharger.rsi Star Wars 14: Shuttle weapon update (#23644) 2024-01-21 19:58:40 +11:00
cell_recharger.rsi machine parts + power cell resprite (#23913) 2024-01-10 23:06:01 -07:00
Generation Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-07-21 12:48:56 +03:00
power.rsi Fix the remaining invalid RSIs (#13113) 2022-12-20 11:49:18 -06:00
recharger.rsi Remove trailing commas from RSIs. (#12865) 2022-12-04 22:47:23 +01:00
smes.rsi Power monitoring console overhaul (#20927) 2023-12-24 17:07:41 +11:00
substation.rsi Substation origin sprites (#2298) 2024-06-19 19:15:24 +12:00
turbo_recharger.rsi Turbo Recharger (#23723) 2024-01-08 00:15:13 -07:00
wall_recharger.rsi Remove trailing commas from RSIs. (#12865) 2022-12-04 22:47:23 +01:00