CatStation/Resources/Textures/Structures/Walls
Morb0 e3f6082c58 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/RoundEnd/RoundEndSystem.cs
#	Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png
#	Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
#	Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png
#	Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png
#	Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
#	Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png
#	Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png
#	Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json
#	Resources/Textures/Interface/Alerts/human_alive.rsi/health4.png
#	Tools/actions_changelogs_since_last_run.py
2023-12-21 03:03:30 +03:00
..
brick.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
clock.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
clown.rsi Adds Bananium (#14663) 2023-04-29 15:38:09 +10:00
cobblebrick.rsi Orewall and cobblestone wall pack (#21034) 2023-10-20 17:00:24 -04:00
cobblebrick_andesite.rsi Orewall and cobblestone wall pack (#21034) 2023-10-20 17:00:24 -04:00
cobblebrick_asteroid.rsi Orewall and cobblestone wall pack (#21034) 2023-10-20 17:00:24 -04:00
cobblebrick_basalt.rsi Orewall and cobblestone wall pack (#21034) 2023-10-20 17:00:24 -04:00
cobblebrick_chromite.rsi Orewall and cobblestone wall pack (#21034) 2023-10-20 17:00:24 -04:00
cobblebrick_sand.rsi Orewall and cobblestone wall pack (#21034) 2023-10-20 17:00:24 -04:00
cobblebrick_snow.rsi Orewall and cobblestone wall pack (#21034) 2023-10-20 17:00:24 -04:00
cult.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
debug.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
diamond.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
fence.rsi Chain link fencing (#18956) 2023-08-11 00:16:25 +10:00
gold.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
grille.rsi diagonal window glass and pirate shuttle improvements (#21174) 2023-11-05 19:38:02 -07:00
ice.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
meat.rsi Sheet-meister 2000 (#16686) 2023-06-15 10:49:23 +10:00
mining.rsi Necropolis and mine walls (#20578) 2023-09-28 10:07:12 -07:00
mining_diagonal.rsi Necropolis and mine walls (#20578) 2023-09-28 10:07:12 -07:00
necropolis.rsi Necropolis and mine walls (#20578) 2023-09-28 10:07:12 -07:00
plasma.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
plastic.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
plastitanium.rsi Fix a bunch of invalid rsi files (#13104) 2022-12-20 09:36:59 +01:00
plastitanium_diagonal.rsi [Sprite] Diagonal walls (#15973) 2023-05-06 20:36:39 -04:00
railing.rsi U-Shape Rails (#19485) 2023-09-20 18:26:16 +10:00
random.rsi Random Grille Spawner for mappers. (#19416) 2023-08-21 22:21:45 -04:00
riveted.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
rock.rsi Add coal distribution to progen (#22755) 2023-12-20 16:46:20 -07:00
sandstone.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
shuttle.rsi Make shuttle walls/windows constructable (#19255) 2023-11-20 17:20:24 -08:00
shuttle_diagonal.rsi Add smoothing for diagonal walls (#13259) 2023-01-27 00:03:42 -04:00
shuttleinterior.rsi Make shuttle walls/windows constructable (#19255) 2023-11-20 17:20:24 -08:00
silver.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
solid.rsi [Resprite] Reinforced wall (#959) 2023-04-05 10:48:44 -07:00
solid_diagonal.rsi Diagonal walls resprite (#1562) 2023-11-09 12:20:22 +03:00
solidrust.rsi Legendary Rust Wall Resprite (#1474) 2023-10-20 10:51:48 +03:00
uranium.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
vault.rsi Vault Walls (alien, sandstone and rock) (#7799) 2022-05-02 15:38:06 -07:00
web.rsi Arachnid rework (#18631) 2023-08-13 01:38:05 -06:00
wood.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00