Skip to content

Commit

Permalink
NuTochnoPoslednieFixiki
Browse files Browse the repository at this point in the history
  • Loading branch information
Gersoon458 committed Sep 4, 2024
1 parent d39617b commit f6c184c
Show file tree
Hide file tree
Showing 5 changed files with 137 additions and 33 deletions.
31 changes: 0 additions & 31 deletions Resources/Prototypes/Entities/Objects/Misc/tiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
state: steel
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: steel
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: steel
- type: FloorTile
Expand Down Expand Up @@ -80,7 +79,6 @@
state: checker-dark
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: checker-dark
sprite: _White/Objects/Tiles/tile.rsi
- type: FloorTile
outputs:
Expand All @@ -96,7 +94,6 @@
state: checker-light
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: checker-light
sprite: _White/Objects/Tiles/tile.rsi
- type: FloorTile
outputs:
Expand Down Expand Up @@ -131,7 +128,6 @@
state: wood
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: wood
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: wood
- type: FloorTile
Expand All @@ -153,7 +149,6 @@
state: white
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: white
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: white
- type: FloorTile
Expand All @@ -175,7 +170,6 @@
state: dark
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: dark
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: dark
- type: FloorTile
Expand Down Expand Up @@ -213,7 +207,6 @@
state: reinforced
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: reinforced
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: reinforced
- type: FloorTile
Expand Down Expand Up @@ -250,7 +243,6 @@
state: lino
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: lino
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: steel
- type: FloorTile
Expand Down Expand Up @@ -387,7 +379,6 @@
state: rockvault
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: rockvault
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: steel
- type: FloorTile
Expand All @@ -406,7 +397,6 @@
state: blue
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: blue
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: carpet-blue
- type: FloorTile
Expand All @@ -425,7 +415,6 @@
state: lime
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: lime
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: steel
- type: FloorTile
Expand Down Expand Up @@ -493,7 +482,6 @@
state: freezer
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: freezer
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: showroom
- type: FloorTile
Expand All @@ -512,7 +500,6 @@
state: showroom
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: showroom
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: showroom
- type: FloorTile
Expand All @@ -531,7 +518,6 @@
state: hydro
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: hydro
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: hydro
- type: FloorTile
Expand All @@ -550,7 +536,6 @@
state: bar
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: bar
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: steel
- type: FloorTile
Expand All @@ -569,7 +554,6 @@
state: clown
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: clown
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: steel
- type: FloorTile
Expand All @@ -588,7 +572,6 @@
state: mime
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: mime
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: steel
- type: FloorTile
Expand All @@ -607,7 +590,6 @@
state: kitchen
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: kitchen
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: dark
- type: FloorTile
Expand All @@ -626,7 +608,6 @@
state: laundry
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: laundry
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: steel
- type: FloorTile
Expand Down Expand Up @@ -840,7 +821,6 @@
state: shuttleblue
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: shuttleblue
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: shuttleblue
- type: FloorTile
Expand All @@ -859,7 +839,6 @@
state: shuttleorange
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: shuttleorange
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: shuttleorange
- type: FloorTile
Expand All @@ -878,7 +857,6 @@
state: shuttlepurple
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: shuttlepurple
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: shuttlepurple
- type: FloorTile
Expand All @@ -897,7 +875,6 @@
state: shuttlered
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: shuttlered
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: shuttlered
- type: FloorTile
Expand All @@ -916,7 +893,6 @@
state: shuttlegrey
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: shuttlegrey
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: shuttlegrey
- type: FloorTile
Expand All @@ -935,7 +911,6 @@
state: shuttleblack
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: checker-light
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: shuttleblack
- type: FloorTile
Expand All @@ -955,7 +930,6 @@
state: gold
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: gold
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: gold
- type: FloorTile
Expand All @@ -974,7 +948,6 @@
state: silver
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: silver
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: silver
- type: FloorTile
Expand All @@ -994,7 +967,6 @@
state: gcircuit
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: gcircuit
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: gcircuit
- type: FloorTile
Expand All @@ -1013,7 +985,6 @@
state: bcircuit
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: bcircuit
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: bcircuit
- type: FloorTile
Expand Down Expand Up @@ -1099,7 +1070,6 @@
state: woodpatternfloor
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: woodpatternfloor
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: wood
- type: FloorTile
Expand Down Expand Up @@ -1273,7 +1243,6 @@
state: wood-large
sprite: _White/Objects/Tiles/tile.rsi
- type: Item
state: wood-large
sprite: _White/Objects/Tiles/tile.rsi
heldPrefix: wood
- type: FloorTile
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Tiles/floors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@
- type: tile
id: FloorRockVault
name: tiles-rock-floor
sprite: /Textures/Tiles/rock_vault.png
sprite: /Textures/_White/Tiles/rock_vault.png
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
Expand Down
132 changes: 132 additions & 0 deletions Resources/Textures/Tiles/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
# Attempted to keep the files in alphabetical order so its easier to audit.
# Finding individual authors is an unfeasible task. If you can reference the author please do so.

- files: ["tech_maint.png"]
license: "CC-BY-SA-3.0"
copyright: "CEV-Eris commit 28e589f0ff72a009adf17db767e90be39054f0f2"
source: "https://github.com/discordia-space/CEV-Eris/"

- 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: ["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/"

- files: ["super_reinforced.png"]
license: "CC-BY-SA-3.0"
copyright: "Modified from reinforced.png by github user @Flareguy"
source: "https://github.com/space-wizards/space-station-14/pull/18676"

- files: ["asteroid_plating.png, snow_plating.png"]
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."
source: "https://github.com/space-wizards/space-station-14/pull/17948"

- files: ["glass.png"]
license: "CC0-1.0"
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"
source: "https://github.com/space-wizards/space-station-14/"

- files: ["arcadeblue.png", "arcadered.png"]
license: "CC-BY-SA-3.0"
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"]
license: "CC-BY-SA-3.0"
copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae"
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", "green_circuit.png", "blue_circuit.png", "red_circuit.png"]
license: "CC-BY-SA-3.0"
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"]
license: "MIT"
copyright: "created by 20kdc"
source: "https://github.com/ParadiseSS13/Paradise"

- files: ["arcadeblue2.png", "boxing.png", "carpetclown.png", "carpetoffice.png", "gym.png", "metaldiamond.png"]
license: "CC-BY-NC-SA-3.0"
copyright: "by WALPVRGIS for Goonstation, taken at commit 236551b95a5b24917c72f3069223026b2dc4e690 from floors.dmi"
source: "https://github.com/goonstation/goonstation"

- files: ["cave.png", "cavedrought.png"]
license: "CC-BY-NC-SA-3.0"
copyright: "Mojave-Sun, taken at commit 0587dd16e28108bdf0b0a28e2caae4319845e861"
source: "https://github.com/Mojave-Sun/mojave-sun-13"

- files: ["grassdark.png", "grasslight.png", "dirt.png"]
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, ."
source: "https://github.com/space-wizards/space-station-14/pull/12193"

- files: ["meat.png"]
license: "CC0-1.0"
copyright: "Created by EmoGarbage404 (github) for space-station-14."
source: "https://github.com/space-wizards/space-station-14/pull/13766"

- files: ["wood_broken.png"]
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"
source: "https://github.com/Mojave-Sun/mojave-sun-13"

- files: ["mining_floor.png", "mining_floor_dark.png", "mining_floor_light.png"]
license: "CC-BY-SA-3.0"
copyright: "taken at https://github.com/ParadiseSS13/Paradise/commit/43889a89d5a9378fd120d627f74613edb1841a66"
source: "https://github.com/ParadiseSS13/Paradise"

- files: ["latticeTrain.png"]
license: "CC0-1.0"
copyright: "Created by TheShuEd (github) for space-station-14."
source: "https://github.com/space-wizards/space-station-14/pull/24927"

- files: ["wood_large.png"]
license: "CC0-1.0"
copyright: "Created by ps3moira (github) for space-station-14."
source: "https://github.com/space-wizards/space-station-14/"
Loading

0 comments on commit f6c184c

Please sign in to comment.