diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl index 76185a1019..87005cec5f 100644 --- a/Resources/Locale/en-US/tiles/tiles.ftl +++ b/Resources/Locale/en-US/tiles/tiles.ftl @@ -10,6 +10,8 @@ tiles-steel-floor-mono = steel mono tile tiles-steel-floor-pavement-vertical = steel vertical pavement tiles-steel-floor-herringbone = steel herringbone tiles-steel-floor-diagonal-mini = steel diagonal mini-tile +tiles-steel-floor-checker-dark = steel dark checker tile +tiles-steel-floor-checker-light = steel light checker tile tiles-plastic-floor = plastic tile tiles-wood = wood tiles-white-floor = white steel tile @@ -34,6 +36,7 @@ tiles-dark-floor-diagonal-mini = dark steel diagonal mini-tile tiles-plastic-dark-floor = dark plastic tile tiles-techmaint-floor = techmaint floor tiles-reinforced-floor = reinforced floor +tiles-super-reinforced-floor = hardened reinforced floor tiles-mono-floor = mono floor tiles-linoleum-floor = linoleum floor tiles-dirty-steel-floor = dirty steel floor @@ -93,3 +96,5 @@ tiles-grass-planet-floor = grass planet floor tiles-basalt-floor = basalt floor tiles-snow-floor = snow floor tiles-wood3 = wood broken floor +tiles-hull = exterior hull plating +tiles-hull-reinforced = exterior reinforced hull plating \ No newline at end of file diff --git a/Resources/Prototypes/Decals/dirty.yml b/Resources/Prototypes/Decals/dirty.yml index d53242304c..9c19bae45c 100644 --- a/Resources/Prototypes/Decals/dirty.yml +++ b/Resources/Prototypes/Decals/dirty.yml @@ -28,6 +28,13 @@ sprite: Decals/dirty.rsi state: dirtheavy +- type: decal + id: DirtHeavyMonotile + tags: ["station", "dirty"] + sprite: + sprite: Decals/dirty.rsi + state: dirtheavy-mono + - type: decal id: Damaged tags: ["station", "dirty"] diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index b3970f760e..819748d58b 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -59,6 +59,30 @@ graph: TileSteel node: steeltile +- type: entity + name: steel dark checker tile + parent: FloorTileItemSteel + id: FloorTileItemSteelCheckerDark + components: + - type: Sprite + state: checker-dark + - type: FloorTile + outputs: + - Plating + - FloorSteelCheckerDark + +- type: entity + name: steel light checker tile + parent: FloorTileItemSteel + id: FloorTileItemSteelCheckerLight + components: + - type: Sprite + state: checker-light + - type: FloorTile + outputs: + - Plating + - FloorSteelCheckerLight + - type: entity name: steel tile parent: FloorTileItemBase diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 170b200188..fec7c193a6 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -12,6 +12,34 @@ itemDrop: FloorTileItemSteel heatCapacity: 10000 +- type: tile + id: FloorSteelCheckerLight + name: tiles-steel-floor-checker-light + sprite: /Textures/Tiles/cafeteria.png + variants: 4 + placementVariants: [0, 1, 2, 3] + baseTurf: Plating + isSubfloor: false + canCrowbar: true + footstepSounds: + collection: FootstepFloor + itemDrop: FloorTileItemSteelCheckerLight + heatCapacity: 10000 + +- type: tile + id: FloorSteelCheckerDark + name: tiles-steel-floor-checker-dark + sprite: /Textures/Tiles/checker_dark.png + variants: 4 + placementVariants: [0, 1, 2, 3] + baseTurf: Plating + isSubfloor: false + canCrowbar: true + footstepSounds: + collection: FootstepFloor + itemDrop: FloorTileItemSteelCheckerDark + heatCapacity: 10000 + - type: tile id: FloorSteelMini name: tiles-steel-floor-mini @@ -1181,3 +1209,42 @@ collection: BarestepWood itemDrop: MaterialWoodPlank1 heatCapacity: 10000 + +#Hull tiles +- type: tile + id: FloorHull + name: tiles-hull + sprite: /Textures/Tiles/hull.png + baseTurf: Plating + isSubfloor: false + canCrowbar: false + canAxe: false #You can't RCD these in SS13 apparently, so this is probably the next best thing + footstepSounds: + collection: FootstepHull + itemDrop: FloorTileItemSteel #probably should not be normally obtainable, but the game shits itself and dies when you try to put null here + heatCapacity: 10000 + +- type: tile + id: FloorHullReinforced + name: tiles-hull-reinforced + sprite: /Textures/Tiles/hull_reinforced.png + baseTurf: Plating + isSubfloor: false + canCrowbar: false + canAxe: false #You can't RCD these in SS13 apparently, so this is probably the next best thing + footstepSounds: + collection: FootstepHull + itemDrop: FloorTileItemSteel + heatCapacity: 100000 #/tg/ has this set as "INFINITY." I don't know if that exists here so I've just added an extra 0 + +- type: tile + id: FloorReinforcedHardened + name: tiles-super-reinforced-floor + sprite: /Textures/Tiles/super_reinforced.png + baseTurf: Plating + isSubfloor: false + canCrowbar: false + canAxe: false + footstepSounds: + collection: FootstepHull + itemDrop: FloorTileItemReinforced #same case as FloorHull \ No newline at end of file diff --git a/Resources/Textures/Decals/dirty.rsi/dirtheavy-mono.png b/Resources/Textures/Decals/dirty.rsi/dirtheavy-mono.png new file mode 100644 index 0000000000..818f5b5b8f Binary files /dev/null and b/Resources/Textures/Decals/dirty.rsi/dirtheavy-mono.png differ diff --git a/Resources/Textures/Decals/dirty.rsi/meta.json b/Resources/Textures/Decals/dirty.rsi/meta.json index e178caeb8b..ac71522d44 100644 --- a/Resources/Textures/Decals/dirty.rsi/meta.json +++ b/Resources/Textures/Decals/dirty.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "tgstation at 606005645d3a14c4439e5ce14785650121b22678", + "copyright": "tgstation at 606005645d3a14c4439e5ce14785650121b22678, dirtheavy-mono made by github user @Flareguy", "size": { "x": 32, "y": 32 @@ -19,6 +19,9 @@ { "name": "dirtheavy" }, + { + "name": "dirtheavy-mono" + }, { "name": "damaged" }, diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/checker-dark.png b/Resources/Textures/Objects/Tiles/tile.rsi/checker-dark.png new file mode 100644 index 0000000000..5a26573cf5 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/checker-dark.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/checker-light.png b/Resources/Textures/Objects/Tiles/tile.rsi/checker-light.png new file mode 100644 index 0000000000..4377bd29a5 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/checker-light.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index 0dcf9a0b7e..7595661407 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -13,6 +13,12 @@ { "name": "dirty" }, + { + "name": "checker-light" + }, + { + "name": "checker-dark" + }, { "name": "gcircuit" }, diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml index 701996f8c9..e6fbd44bec 100644 --- a/Resources/Textures/Tiles/attributions.yml +++ b/Resources/Textures/Tiles/attributions.yml @@ -15,6 +15,11 @@ 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: ["rglass.png"] license: "CC-BY-SA-3.0" @@ -26,7 +31,7 @@ copyright: "Created by github user @notquitehadouken." source: "https://github.com/space-wizards/space-station-14/pull/17948" -- files: [ "bar.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", "clown.png" ] +- files: [ "bar.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/" @@ -36,6 +41,11 @@ 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"] license: "CC-BY-SA-3.0" copyright: "paradisestation commit 69c831afcd9aef25a2889b507e4f36a3a5fc6def, originally from /VG/ eris" diff --git a/Resources/Textures/Tiles/cafeteria.png b/Resources/Textures/Tiles/cafeteria.png new file mode 100644 index 0000000000..69e8dc47f0 Binary files /dev/null and b/Resources/Textures/Tiles/cafeteria.png differ diff --git a/Resources/Textures/Tiles/checker_dark.png b/Resources/Textures/Tiles/checker_dark.png new file mode 100644 index 0000000000..01a9120958 Binary files /dev/null and b/Resources/Textures/Tiles/checker_dark.png differ diff --git a/Resources/Textures/Tiles/hull.png b/Resources/Textures/Tiles/hull.png new file mode 100644 index 0000000000..928fb3a2f1 Binary files /dev/null and b/Resources/Textures/Tiles/hull.png differ diff --git a/Resources/Textures/Tiles/hull_reinforced.png b/Resources/Textures/Tiles/hull_reinforced.png new file mode 100644 index 0000000000..39d512d9a2 Binary files /dev/null and b/Resources/Textures/Tiles/hull_reinforced.png differ diff --git a/Resources/Textures/Tiles/super_reinforced.png b/Resources/Textures/Tiles/super_reinforced.png new file mode 100644 index 0000000000..cff37b0ff8 Binary files /dev/null and b/Resources/Textures/Tiles/super_reinforced.png differ