This reverts commit 38f921f831.
This commit is contained in:
@@ -76,9 +76,7 @@ tiles-red-shuttle-floor = red shuttle floor
|
|||||||
tiles-gold-tile = gold tile
|
tiles-gold-tile = gold tile
|
||||||
tiles-silver-tile = silver tile
|
tiles-silver-tile = silver tile
|
||||||
tiles-glass-floor = glass floor
|
tiles-glass-floor = glass floor
|
||||||
tiles-glass-floor-alt = fancy glass floor
|
|
||||||
tiles-reinforced-glass-floor = reinforced glass floor
|
tiles-reinforced-glass-floor = reinforced glass floor
|
||||||
tiles-reinforced-glass-floor-alt = fancy reinforced glass floor
|
|
||||||
tiles-green-circuit-floor = green circuit floor
|
tiles-green-circuit-floor = green circuit floor
|
||||||
tiles-blue-circuit-floor = blue circuit floor
|
tiles-blue-circuit-floor = blue circuit floor
|
||||||
tiles-snow = snow
|
tiles-snow = snow
|
||||||
|
|||||||
@@ -1179,18 +1179,6 @@
|
|||||||
id: FloorGlass
|
id: FloorGlass
|
||||||
name: tiles-glass-floor
|
name: tiles-glass-floor
|
||||||
sprite: /Textures/Tiles/glass.png
|
sprite: /Textures/Tiles/glass.png
|
||||||
baseTurf: Plating
|
|
||||||
isSubfloor: false
|
|
||||||
canCrowbar: true
|
|
||||||
footstepSounds:
|
|
||||||
collection: FootstepTile
|
|
||||||
itemDrop: SheetGlass1
|
|
||||||
heatCapacity: 10000
|
|
||||||
|
|
||||||
- type: tile
|
|
||||||
id: FloorGlassAlt
|
|
||||||
name: tiles-glass-floor-alt
|
|
||||||
sprite: /Textures/Tiles/glass_alt.png
|
|
||||||
variants: 4
|
variants: 4
|
||||||
placementVariants:
|
placementVariants:
|
||||||
- 1.0
|
- 1.0
|
||||||
@@ -1209,18 +1197,6 @@
|
|||||||
id: FloorRGlass
|
id: FloorRGlass
|
||||||
name: tiles-reinforced-glass-floor
|
name: tiles-reinforced-glass-floor
|
||||||
sprite: /Textures/Tiles/rglass.png
|
sprite: /Textures/Tiles/rglass.png
|
||||||
baseTurf: Plating
|
|
||||||
isSubfloor: false
|
|
||||||
canCrowbar: true
|
|
||||||
footstepSounds:
|
|
||||||
collection: FootstepTile
|
|
||||||
itemDrop: SheetRGlass1
|
|
||||||
heatCapacity: 10000
|
|
||||||
|
|
||||||
- type: tile
|
|
||||||
id: FloorRGlassAlt
|
|
||||||
name: tiles-reinforced-glass-floor-alt
|
|
||||||
sprite: /Textures/Tiles/rglass_alt.png
|
|
||||||
variants: 4
|
variants: 4
|
||||||
placementVariants:
|
placementVariants:
|
||||||
- 1.0
|
- 1.0
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae."
|
copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae."
|
||||||
source: "https://github.com/tgstation/tgstation/"
|
source: "https://github.com/tgstation/tgstation/"
|
||||||
|
|
||||||
- files: ["blue_circuit.png", "cropped_parallax.png", "glass.png", "eighties.png", "gold.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "plating.png", "rglass.png", "reinforced.png", "silver.png", "snow.png", "wood.png"]
|
- 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", "plating.png", "reinforced.png", "silver.png", "snow.png", "wood.png"]
|
||||||
license: "CC-BY-SA-3.0"
|
license: "CC-BY-SA-3.0"
|
||||||
copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, cropped_parallax modified from parallax."
|
copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, cropped_parallax modified from parallax."
|
||||||
source: "https://github.com/tgstation/tgstation/"
|
source: "https://github.com/tgstation/tgstation/"
|
||||||
@@ -31,12 +31,12 @@
|
|||||||
copyright: "Modified from plating.png by github user @Flareguy"
|
copyright: "Modified from plating.png by github user @Flareguy"
|
||||||
source: "https://github.com/space-wizards/space-station-14/"
|
source: "https://github.com/space-wizards/space-station-14/"
|
||||||
|
|
||||||
- files: ["rglass_alt.png"]
|
- files: ["rglass.png"]
|
||||||
license: "CC-BY-SA-3.0"
|
license: "CC-BY-SA-3.0"
|
||||||
copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, rglass modified by github user @notquitehadouken."
|
copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, rglass modified by github user @notquitehadouken."
|
||||||
source: "https://github.com/space-wizards/space-station-14/pull/17948"
|
source: "https://github.com/space-wizards/space-station-14/pull/17948"
|
||||||
|
|
||||||
- files: ["glass_alt.png"]
|
- files: ["glass.png"]
|
||||||
license: "CC0-1.0"
|
license: "CC0-1.0"
|
||||||
copyright: "Created by github user @notquitehadouken."
|
copyright: "Created by github user @notquitehadouken."
|
||||||
source: "https://github.com/space-wizards/space-station-14/pull/17948"
|
source: "https://github.com/space-wizards/space-station-14/pull/17948"
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 547 B After Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 413 B After Width: | Height: | Size: 3.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 KiB |
Reference in New Issue
Block a user