NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 18:31:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Resources/Textures/Tiles
History
Exact
Morb0 3ab6d3ef71 Merge remote-tracking branch 'wizards/master' into upstream-sync 
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Content.Server/VoiceMask/VoiceMaskComponent.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Content.Server/VoiceMask/VoiceMaskerComponent.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Entities/Clothing/Masks/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Command/captain.yml
#	Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/blue_circuit.png
#	Resources/Textures/Tiles/green_circuit.png
#	Resources/Textures/Tiles/steel.png
2024-10-04 19:47:54 +03:00
..
Asteroid Yet Another Asteroid-Related Tile Update (read: asteroid tile variantizing) (#19237) 2023-08-24 23:40:04 -04:00
Misc Floor trap (#26314) 2024-04-20 16:09:00 +10:00
Planet Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-08-12 13:18:43 +03:00
arcadeblue.png
arcadeblue2.png Goon floor pack 1 (#8267) 2022-06-02 12:10:58 +10:00
arcadered.png
attributions.yml Merge remote-tracking branch 'wizards/master' into upstream-sync 2024-10-04 19:47:54 +03:00
bar.png Tile Resprite: Return of Supernorn-style tiles (#18513) 2023-08-01 00:09:46 -06:00
blue.png Corvax Retexture pack (#1863) 2024-02-16 13:43:35 +03:00
blue_circuit.png Red circuit floor (#32557) 2024-10-01 23:35:48 -06:00
boxing.png Goon floor pack 1 (#8267) 2022-06-02 12:10:58 +10:00
cafeteria.png Tiles Corvax Stylization (#1431) 2023-09-19 12:21:53 +03:00
carpetclown.png Goon floor pack 1 (#8267) 2022-06-02 12:10:58 +10:00
carpetoffice.png Goon floor pack 1 (#8267) 2022-06-02 12:10:58 +10:00
cave.png Adds two new cave floors (#9873) 2022-08-02 05:55:30 -07:00
cavedrought.png Adds two new cave floors (#9873) 2022-08-02 05:55:30 -07:00
checker_dark.png Tiles Corvax Stylization (#1431) 2023-09-19 12:21:53 +03:00
chromite.png Shadow Dimension visual pack (#21237) 2023-10-26 00:36:22 +11:00
clown.png Tile Resprite: Return of Supernorn-style tiles (#18513) 2023-08-01 00:09:46 -06:00
cropped_parallax.png
dark.png Tile Resprite: Return of Supernorn-style tiles (#18513) 2023-08-01 00:09:46 -06:00
dark_diagonal.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
dark_diagonal_mini.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
dark_herringbone.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
dark_mini.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
dark_mono.png [Art] Monotiles resprite (#2550) 2024-09-02 12:05:38 +12:00
dark_offset.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
dark_pavement.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
dark_pavement_vertical.png Fix pavement vertical sprite (#2437) 2024-07-29 10:05:56 +12:00
dark_plastic.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
deprecated.png Underplating, go away (#8138) 2022-05-17 11:11:47 -07:00
dirt.png New grass & dirt tiles. Split minor update. (#10260) 2022-08-06 18:13:35 -07:00
eighties.png
elevator_shaft.png [Art] Mining structures retexture (#2465) 2024-08-14 13:25:25 +03:00
foammetal.png metal foam grenades (#29428) 2024-07-08 00:26:58 +10:00
freezer.png
glass.png Glass tile texture revert (#2234) 2024-06-14 11:45:22 +12:00
gold.png
grass.png Retexture grass & dirt tiles (#2282) 2024-06-18 16:45:36 +12:00
grassdark.png Retexture grass & dirt tiles (#2282) 2024-06-18 16:45:36 +12:00
grassjungle.png Retexture grass & dirt tiles (#2282) 2024-06-18 16:45:36 +12:00
grasslight.png Retexture grass & dirt tiles (#2282) 2024-06-18 16:45:36 +12:00
grating_maint.png New Tiles (2 maintenance specific and 1 new wood). (#12193) 2022-10-25 13:27:06 -05:00
green_circuit.png Red circuit floor (#32557) 2024-10-01 23:35:48 -06:00
gym.png Goon floor pack 1 (#8267) 2022-06-02 12:10:58 +10:00
hull.png Adds Checkerboard Tiles, External Hull Plating, Hardened Reinforced Floors, & Monotile Dirty Decal (#18676) 2023-08-06 02:27:48 -06:00
hull_reinforced.png Adds Checkerboard Tiles, External Hull Plating, Hardened Reinforced Floors, & Monotile Dirty Decal (#18676) 2023-08-06 02:27:48 -06:00
hydro.png Tile Resprite: Return of Supernorn-style tiles (#18513) 2023-08-01 00:09:46 -06:00
kitchen.png Tile Resprite: Return of Supernorn-style tiles (#18513) 2023-08-01 00:09:46 -06:00
lattice.png
latticeTrain.png Train station (#24927) 2024-02-20 15:21:31 -07:00
laundry.png Tile Resprite: Return of Supernorn-style tiles (#18513) 2023-08-01 00:09:46 -06:00
lime.png Corvax Retexture pack (#1863) 2024-02-16 13:43:35 +03:00
lino.png
meat.png More anomalies (#13766) 2023-02-06 01:03:53 -04:00
metaldiamond.png Goon floor pack 1 (#8267) 2022-06-02 12:10:58 +10:00
mime.png Tiles Corvax Stylization (#1431) 2023-09-19 12:21:53 +03:00
mining_floor.png [Art] Recolor mining tiles (#2499) 2024-08-16 15:59:02 +03:00
mining_floor_dark.png [Art] Recolor mining tiles (#2499) 2024-08-16 15:59:02 +03:00
mining_floor_light.png [Art] Recolor mining tiles (#2499) 2024-08-16 15:59:02 +03:00
mono.png
plastic.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
plating.png removes hueshifting on plating sprites (#18726) 2023-08-05 20:04:12 -04:00
plating_burnt.png Corvax Retexture pack (#1863) 2024-02-16 13:43:35 +03:00
plating_damaged.png Adds damaged plating (#21711) 2023-11-16 22:57:00 -07:00
red_circuit.png Red circuit floor (#32557) 2024-10-01 23:35:48 -06:00
reinforced.png Resprite reinforced tiles (#2236) 2024-06-11 17:30:27 +12:00
rglass.png Glass tile texture revert (#2234) 2024-06-14 11:45:22 +12:00
rock_vault.png
showroom.png
shuttleblack.png Shuttle floor resprite (#25127) 2024-02-11 13:53:56 -07:00
shuttleblue.png Shuttle floor resprite (#25127) 2024-02-11 13:53:56 -07:00
shuttlegrey.png Shuttle floor resprite (#25127) 2024-02-11 13:53:56 -07:00
shuttleorange.png Shuttle floor resprite (#25127) 2024-02-11 13:53:56 -07:00
shuttlepurple.png Shuttle floor resprite (#25127) 2024-02-11 13:53:56 -07:00
shuttlered.png Shuttle floor resprite (#25127) 2024-02-11 13:53:56 -07:00
shuttlewhite.png Shuttle floor resprite (#25127) 2024-02-11 13:53:56 -07:00
silver.png
snow.png
snow_plating.png Yet Another Asteroid-Related Tile Update (read: asteroid tile variantizing) (#19237) 2023-08-24 23:40:04 -04:00
steel.png Steel tile variantization fix (#32596) 2024-10-02 14:14:44 +02:00
steel_burnt.png Adds damaged steel tiles (#21700) 2023-11-16 14:09:50 -07:00
steel_damaged.png Adds damaged steel tiles (#21700) 2023-11-16 14:09:50 -07:00
steel_diagonal.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
steel_diagonal_mini.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
steel_dirty.png resprites plastic & dirty steel tiles to match new floortile style (#18643) 2023-08-04 02:55:07 -06:00
steel_herringbone.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
steel_maint.png New Tiles (2 maintenance specific and 1 new wood). (#12193) 2022-10-25 13:27:06 -05:00
steel_mini.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
steel_mono.png [Art] Monotiles resprite (#2550) 2024-09-02 12:05:38 +12:00
steel_offset.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
steel_pavement.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
steel_pavement_vertical.png Fix pavement vertical sprite (#2437) 2024-07-29 10:05:56 +12:00
SteelTileSpritingGuide.txt Slight monotile modification & raw sprites folder (#19613) 2023-08-30 19:02:35 -06:00
super_reinforced.png Resprite reinforced tiles (#2236) 2024-06-11 17:30:27 +12:00
tech_maint.png Revert "Plating & Tech Maint resprites (#15817)" (#16002) 2023-05-02 16:04:12 +10:00
tile-reference-sheet.png Slight monotile modification & raw sprites folder (#19613) 2023-08-30 19:02:35 -06:00
tile.png
white.png Tile Resprite: Return of Supernorn-style tiles (#18513) 2023-08-01 00:09:46 -06:00
white_diagonal.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
white_diagonal_mini.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
white_herringbone.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
white_mini.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
white_mono.png [Art] Monotiles resprite (#2550) 2024-09-02 12:05:38 +12:00
white_offset.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
white_pavement.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
white_pavement_vertical.png Fix pavement vertical sprite (#2437) 2024-07-29 10:05:56 +12:00
white_plastic.png Resprite overlays and fix some steel tiles (#1868) 2024-02-18 12:27:14 +03:00
wood.png Resprite wooden tiles and adds new decals (#2344) 2024-06-26 22:41:06 +12:00
wood_broken.png Resprite wooden tiles and adds new decals (#2344) 2024-06-26 22:41:06 +12:00
wood_large.png Resprite wooden tiles and adds new decals (#2344) 2024-06-26 22:41:06 +12:00
wood_tile.png Resprite wooden tiles and adds new decals (#2344) 2024-06-26 22:41:06 +12:00