Skip to content

Commit

Permalink
The Floors! (Resprites) (#417)
Browse files Browse the repository at this point in the history
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Edit/Resprite most of the floors in-game because in all honest TG
Floors... currently... are extremly flat and old... even TG already has
upgraded their floors...
This also changed some minor edits to decals to fit, This PR is
recomended paired with #402 and others updated looks PRs

This bring new floors sprites from baystation, paradise station.

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] Import Sprites
- [x] @VMSolidus Edits

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/01a4351c-b72a-446f-9db5-ca50f63f140e)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/bde02ff6-38d9-49a5-8594-a53e005a4075)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/9e4b508e-9512-481b-8e7e-a2f500a6375c)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/34634648-c489-4581-8d5f-ee088744255d)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/4e0b666c-ba84-4c5b-ae63-ee2af3c44b96)

</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- tweak: Floors Looks Updated/Resprited.

---------

Co-authored-by: VMSolidus <[email protected]>
  • Loading branch information
FoxxoTrystan and VMSolidus committed Jun 3, 2024
1 parent 47672c9 commit f175e19
Show file tree
Hide file tree
Showing 161 changed files with 29 additions and 66 deletions.
46 changes: 2 additions & 44 deletions Resources/Prototypes/Tiles/floors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
collection: FootstepHull
itemDrop: FloorTileItemBrassFilled
heatCapacity: 10000

- type: tile
id: FloorBrassReebe
name: tiles-brass-floor-reebe
Expand Down Expand Up @@ -1207,12 +1207,6 @@
id: FloorShuttleWhite
name: tiles-white-shuttle-floor
sprite: /Textures/Tiles/shuttlewhite.png
variants: 4
placementVariants:
- 1.0
- 1.0
- 1.0
- 1.0
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
Expand All @@ -1225,12 +1219,6 @@
id: FloorShuttleGrey
name: tiles-grey-shuttle-floor
sprite: /Textures/Tiles/shuttlegrey.png
variants: 4
placementVariants:
- 1.0
- 1.0
- 1.0
- 1.0
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
Expand All @@ -1243,12 +1231,6 @@
id: FloorShuttleBlack
name: tiles-black-shuttle-floor
sprite: /Textures/Tiles/shuttleblack.png
variants: 4
placementVariants:
- 1.0
- 1.0
- 1.0
- 1.0
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
Expand All @@ -1261,12 +1243,6 @@
id: FloorShuttleBlue
name: tiles-blue-shuttle-floor
sprite: /Textures/Tiles/shuttleblue.png
variants: 4
placementVariants:
- 1.0
- 1.0
- 1.0
- 1.0
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
Expand All @@ -1279,12 +1255,6 @@
id: FloorShuttleOrange
name: tiles-orange-shuttle-floor
sprite: /Textures/Tiles/shuttleorange.png
variants: 4
placementVariants:
- 1.0
- 1.0
- 1.0
- 1.0
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
Expand All @@ -1297,12 +1267,6 @@
id: FloorShuttlePurple
name: tiles-purple-shuttle-floor
sprite: /Textures/Tiles/shuttlepurple.png
variants: 4
placementVariants:
- 1.0
- 1.0
- 1.0
- 1.0
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
Expand All @@ -1315,12 +1279,6 @@
id: FloorShuttleRed
name: tiles-red-shuttle-floor
sprite: /Textures/Tiles/shuttlered.png
variants: 4
placementVariants:
- 1.0
- 1.0
- 1.0
- 1.0
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
Expand Down Expand Up @@ -1940,4 +1898,4 @@
barestepSounds:
collection: BarestepWood
itemDrop: FloorTileItemWoodLarge
heatCapacity: 10000
heatCapacity: 10000
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_box.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_end_e.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_end_n.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_end_s.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_end_w.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_line_e.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_line_n.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_line_s.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_line_w.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Resources/Textures/Decals/bricktile.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Edited by Flareguy, originally created by github user @moonheart08",
"copyright": "Made by github user @Morb0. Modified v2 by ko4erga (discord)",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_box.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_end_e.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_end_n.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_end_s.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_end_w.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_line_e.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_line_n.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_line_s.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_line_w.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_box.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_corner_se.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_end_e.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_end_n.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_end_s.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_end_w.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_inner_se.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_line_e.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_line_n.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_line_s.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_line_w.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_box.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_corner_ne.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_corner_se.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_corner_sw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_end_e.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_end_n.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_end_s.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_end_w.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_inner_se.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_line_e.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_line_n.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_line_s.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_line_w.png
2 changes: 1 addition & 1 deletion Resources/Textures/Decals/minitile.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Edited by Flareguy, originally created by github user @moonheart08",
"copyright": "Made by github user @Morb0",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_box.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_corner_ne.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_corner_se.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_corner_sw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_end_e.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_end_n.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_end_s.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_end_w.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_inner_se.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_inner_sw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_line_e.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_line_n.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_line_s.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_line_w.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_box.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_corner_ne.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_corner_nw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_corner_se.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_corner_sw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_end_e.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_end_n.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_end_s.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_end_w.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_inner_ne.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_inner_nw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_inner_se.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_inner_sw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_line_e.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_line_n.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_line_s.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_line_w.png
Binary file modified Resources/Textures/Tiles/arcadeblue2.png
45 changes: 25 additions & 20 deletions Resources/Textures/Tiles/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,22 @@
copyright: "CEV-Eris commit 28e589f0ff72a009adf17db767e90be39054f0f2"
source: "https://github.com/discordia-space/CEV-Eris/"

- files: ["plating.png"]
license: "CC-BY-SA-3.0"
copyright: "Taken from CEV-Eris commit 8e74e4370f4d5885f15c3f834973b1223ddb8b1b, modified by github user @Flareguy"
source: "https://github.com/discordia-space/CEV-Eris/"

- files: ["plating_damaged.png", "plating_burnt.png"]
license: "CC-BY-SA-3.0"
copyright: "Modified by github user @Flareguy from plating.png, using damaged plating sprites from /tg/station at commit https://github.com/tgstation/tgstation/blob/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae/icons/turf/floors.dmi"
source: "https://github.com/space-wizards/space-station-14/pull/21711"

- files: [ "asteroid_red.png", "asteroid_tile.png", "elevator_shaft.png", "freezer.png", "green_circuit.png", "lino.png", "mono.png", "rock_vault.png", "showroom.png"]
- files: [ "asteroid_red.png", "asteroid_tile.png", "elevator_shaft.png", "freezer.png", "lino.png", "mono.png", "rock_vault.png", "showroom.png"]
license: "CC-BY-SA-3.0"
copyright: "vgstation13 at roughly commit e4d3ea7f69d21c3667be12b114fa935c4640cb05, asteroid_red and asteroid_tile taken from commit /vg/station at commit 02b9f6894af4419c9f7e699a22c402b086d8067e."
source: "https://github.com/vgstation-coders/vgstation13"

- files: [ "asteroid.png", "asteroid_dug.png", "asteroid0.png"]
license: "CC-BY-SA-3.0"
copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae."
source: "https://github.com/tgstation/tgstation/"

- files: ["blue_circuit.png", "cropped_parallax.png", "eighties.png", "gold.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "reinforced.png", "silver.png", "snow.png", "wood.png"]
- files: ["steel.png", "dark.png", "hydro.png", "plating.png", "reinforced.png", "steel_dirty.png", "white.png", "bar.png", "laundry.png", "mime.png", "clown.png", "kitchen.png"]
license: "CC-BY-SA-3.0"
copyright: "TauCetiStation commit 4cd533cf0a4243050364023af9a4fcaca209dce7"
source: "https://github.com/TauCetiStation/TauCetiClassic/"

- files: ["cropped_parallax.png", "eighties.png", "gold.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "plating.png", "reinforced.png", "silver.png", "snow.png", "wood.png"]
license: "CC-BY-SA-3.0"
copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, cropped_parallax modified from parallax."
source: "https://github.com/tgstation/tgstation/"
Expand All @@ -40,7 +35,7 @@
license: "CC-BY-SA-3.0"
copyright: "Modified from plating.png by github user @Flareguy"
source: "https://github.com/space-wizards/space-station-14/"

- files: ["rglass.png"]
license: "CC-BY-SA-3.0"
copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, rglass modified by github user @notquitehadouken."
Expand All @@ -51,6 +46,16 @@
copyright: "Created by github user @notquitehadouken."
source: "https://github.com/space-wizards/space-station-14/pull/17948"

- files: [ "steel_diagonal.png", "steel_mini.png", "steel_offset.png", "steel_pavement.png", "white_diagonal.png", "white_mini.png", "white_offset.png", "white_pavement.png", "white_plastic.png", "dark_diagonal.png", "dark_mini.png", "dark_offset.png", "dark_pavement.png", "dark_plastic.png" ]
license: "CC0-1.0"
copyright: "Created by github user @morb0"
source: "https://github.com/space-syndicate/space-station-14/pull/489"

- files: [ "cafeteria.png", "checker_dark.png" ]
license: "CC-BY-SA-3.0"
copyright: "Created by github user @Flareguy, original, unedited base tiles modified from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae and github user @moonheart08"
source: "https://github.com/space-wizards/space-station-14/"

- files: [ "bar.png", "lime.png", "blue.png", "kitchen.png", "laundry.png", "mime.png", "steel.png", "steel_dirty.png", "steel_diagonal.png", "steel_mini.png", "steel_offset.png", "steel_pavement.png", "white.png", "white_diagonal.png", "white_mini.png", "white_offset.png", "white_pavement.png", "dark.png", "dark_diagonal.png", "dark_mini.png", "dark_offset.png", "dark_pavement.png", "hydro.png", "plastic.png", "dark_plastic.png", "white_plastic.png", "cafeteria.png", "checker_dark.png", "clown.png" ]
license: "CC-BY-SA-3.0"
copyright: "Created by github user @Flareguy, original, unedited base tiles modified from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae and github user @moonheart08"
Expand All @@ -61,14 +66,14 @@
copyright: "arcadered renamed from eightiesred, arcadeblue by Peptide90 modified from arcadered.png, tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49"
source: "https://github.com/tgstation/tgstation/"

- files: ["hull", "hull_reinforced.png", "steel_damaged.png", "steel_burnt.png"]
- files: ["hull", "hull_reinforced.png"]
license: "CC-BY-SA-3.0"
copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae"
source: "https://github.com/tgstation/tgstation/"
source: "https://github.com/space-wizards/space-station-14/pull/18676"

- files: ["shuttleblue.png", "shuttleorange.png", "shuttlepurple.png", "shuttlered.png", "shuttlewhite.png", "shuttlegrey.png", "shuttleblack.png"]
- files: ["shuttleblue.png", "shuttleorange.png", "shuttlepurple.png", "shuttlered.png", "shuttlewhite.png", "shuttlegrey.png", "shuttleblack.png", "green_circuit.png", "blue_circuit.png", "red_circuit.png"]
license: "CC-BY-SA-3.0"
copyright: "Modified by Flareguy for Space Station 14. Unmodified sprite from paradisestation commit 69c831afcd9aef25a2889b507e4f36a3a5fc6def, originally from /VG/ eris"
copyright: "Taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/blob/master/icons/turf/floors.dmi"
source: "https://github.com/ParadiseSS13/Paradise"

- files: ["deprecated.png"]
Expand All @@ -90,7 +95,7 @@
license: "CC-BY-SA-3.0"
copyright: "Fortuna commit 2a9408a47e2f83d945335e4feeeeafb552173e6f, grasslight and dirt by Peptide based on grassdark.png and dirt."
source: "https://github.com/FortunaSS13/Fortuna"

- files: ["steel_maint.png", "grating_maint.png", "wood_tile.png"]
license: "CC-BY-SA-3.0"
copyright: "by brainfood for space-station-14, ."
Expand All @@ -105,7 +110,7 @@
license: "CC-BY-SA-3.0"
copyright: "taken at https://github.com/ParadiseSS13/Paradise/blob/8b7f4c8b69c74c6de5a755272eb8d3520f3d87c7/icons/turf/floors.dmi"
source: "https://github.com/ParadiseSS13/Paradise"

- files: ["chromite.png"]
license: "CC-BY-NC-SA-3.0"
copyright: "taken at commit 0587dd16e28108bdf0b0a28e2caae4319845e861, and recolored by TheShuEd"
Expand Down
Binary file modified Resources/Textures/Tiles/bar.png
Binary file modified Resources/Textures/Tiles/blue_circuit.png
Binary file modified Resources/Textures/Tiles/cafeteria.png
Binary file modified Resources/Textures/Tiles/checker_dark.png
Binary file modified Resources/Textures/Tiles/clown.png
Binary file modified Resources/Textures/Tiles/dark.png
Binary file modified Resources/Textures/Tiles/dark_diagonal.png
Binary file modified Resources/Textures/Tiles/dark_diagonal_mini.png
Binary file modified Resources/Textures/Tiles/dark_herringbone.png
Binary file modified Resources/Textures/Tiles/dark_mini.png
Binary file modified Resources/Textures/Tiles/dark_mono.png
Binary file modified Resources/Textures/Tiles/dark_offset.png
Binary file modified Resources/Textures/Tiles/dark_pavement.png
Binary file modified Resources/Textures/Tiles/dark_pavement_vertical.png
Binary file modified Resources/Textures/Tiles/dark_plastic.png
Binary file modified Resources/Textures/Tiles/glass.png
Binary file modified Resources/Textures/Tiles/green_circuit.png
Binary file modified Resources/Textures/Tiles/hydro.png
Binary file modified Resources/Textures/Tiles/kitchen.png
Binary file modified Resources/Textures/Tiles/laundry.png
Binary file modified Resources/Textures/Tiles/lime.png
Binary file modified Resources/Textures/Tiles/mime.png
Binary file modified Resources/Textures/Tiles/plastic.png
Binary file modified Resources/Textures/Tiles/plating.png
Binary file modified Resources/Textures/Tiles/plating_burnt.png
Binary file added Resources/Textures/Tiles/red_circuit.png
Binary file modified Resources/Textures/Tiles/rglass.png
Binary file modified Resources/Textures/Tiles/shuttleblack.png
Binary file modified Resources/Textures/Tiles/shuttleblue.png
Binary file modified Resources/Textures/Tiles/shuttlegrey.png
Binary file modified Resources/Textures/Tiles/shuttleorange.png
Binary file modified Resources/Textures/Tiles/shuttlepurple.png
Binary file modified Resources/Textures/Tiles/shuttlered.png
Binary file modified Resources/Textures/Tiles/shuttlewhite.png
Binary file modified Resources/Textures/Tiles/steel.png
Binary file modified Resources/Textures/Tiles/steel_diagonal.png
Binary file modified Resources/Textures/Tiles/steel_diagonal_mini.png
Binary file modified Resources/Textures/Tiles/steel_dirty.png
Binary file modified Resources/Textures/Tiles/steel_herringbone.png
Binary file modified Resources/Textures/Tiles/steel_mini.png
Binary file modified Resources/Textures/Tiles/steel_mono.png
Binary file modified Resources/Textures/Tiles/steel_offset.png
Binary file modified Resources/Textures/Tiles/steel_pavement.png
Binary file modified Resources/Textures/Tiles/steel_pavement_vertical.png
Binary file modified Resources/Textures/Tiles/white.png
Binary file modified Resources/Textures/Tiles/white_diagonal.png
Binary file modified Resources/Textures/Tiles/white_diagonal_mini.png
Binary file modified Resources/Textures/Tiles/white_herringbone.png
Binary file modified Resources/Textures/Tiles/white_mini.png
Binary file modified Resources/Textures/Tiles/white_mono.png
Binary file modified Resources/Textures/Tiles/white_offset.png
Binary file modified Resources/Textures/Tiles/white_pavement.png
Binary file modified Resources/Textures/Tiles/white_pavement_vertical.png
Binary file modified Resources/Textures/Tiles/white_plastic.png

0 comments on commit f175e19

Please sign in to comment.