diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl index 0536fa3927..d5eb54d5b9 100644 --- a/Resources/Locale/en-US/tiles/tiles.ftl +++ b/Resources/Locale/en-US/tiles/tiles.ftl @@ -52,6 +52,15 @@ tiles-clown-floor = clown floor tiles-mime-floor = mime floor tiles-kitchen-floor = kitchen floor tiles-laundry-floor = laundry floor +tiles-concrete-tile = concrete tile +tiles-concrete-slab = concrete slab +tiles-concrete-smooth = smooth concrete floor +tiles-gray-concrete-tile = gray concrete tile +tiles-gray-concrete-slab = gray concrete slab +tiles-gray-concrete-smooth = smooth gray concrete floor +tiles-old-concrete-tile = old concrete tile +tiles-old-concrete-slab = old concrete slab +tiles-old-concrete-smooth = old smooth concrete floor tiles-blue-arcade-floor = blue arcade floor tiles-red-arcade-floor = red arcade floor tiles-eighties-floor = eighties floor @@ -73,6 +82,7 @@ tiles-blue-circuit-floor = blue circuit floor tiles-snow = snow tiles-snow-plating = snowed plating tiles-grass-floor = grass floor +tiles-asphalt = asphalt tiles-planet-grass-floor = grass floor tiles-jungle-grass-floor = jungle grass floor tiles-dark-grass-floor = dark grass floor diff --git a/Resources/Prototypes/Decals/concrete_trim.yml b/Resources/Prototypes/Decals/concrete_trim.yml new file mode 100644 index 0000000000..43d53c8f82 --- /dev/null +++ b/Resources/Prototypes/Decals/concrete_trim.yml @@ -0,0 +1,356 @@ +- type: decal + id: ConcreteTrimBox + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: concrete_box + +- type: decal + id: ConcreteTrimCornerNe + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: concrete_corner_ne + +- type: decal + id: ConcreteTrimCornerSe + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: concrete_corner_se + +- type: decal + id: ConcreteTrimCornerNw + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: concrete_corner_nw + +- type: decal + id: ConcreteTrimCornerSw + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: concrete_corner_sw + +- type: decal + id: ConcreteTrimInnerNe + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: concrete_inner_ne + +- type: decal + id: ConcreteTrimInnerSe + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: concrete_inner_se + +- type: decal + id: ConcreteTrimInnerNw + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: concrete_inner_nw + +- type: decal + id: ConcreteTrimInnerSw + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: concrete_inner_sw + +- type: decal + id: ConcreteTrimEndN + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: concrete_end_n + +- type: decal + id: ConcreteTrimEndE + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: concrete_end_e + +- type: decal + id: ConcreteTrimEndS + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: concrete_end_s + +- type: decal + id: ConcreteTrimEndW + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: concrete_end_w + +- type: decal + id: ConcreteTrimLineN + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: concrete_line_n + +- type: decal + id: ConcreteTrimLineE + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: concrete_line_e + +- type: decal + id: ConcreteTrimLineS + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: concrete_line_s + +- type: decal + id: ConcreteTrimLineW + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: concrete_line_w + +- type: decal + id: GrayConcreteTrimBox + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: grayconcrete_box + +- type: decal + id: GrayConcreteTrimCornerNe + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: grayconcrete_corner_ne + +- type: decal + id: GrayConcreteTrimCornerSe + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: grayconcrete_corner_se + +- type: decal + id: GrayConcreteTrimCornerNw + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: grayconcrete_corner_nw + +- type: decal + id: GrayConcreteTrimCornerSw + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: grayconcrete_corner_sw + +- type: decal + id: GrayConcreteTrimInnerNe + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: grayconcrete_inner_ne + +- type: decal + id: GrayConcreteTrimInnerSe + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: grayconcrete_inner_se + +- type: decal + id: GrayConcreteTrimInnerNw + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: grayconcrete_inner_nw + +- type: decal + id: GrayConcreteTrimInnerSw + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: grayconcrete_inner_sw + +- type: decal + id: GrayConcreteTrimEndN + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: grayconcrete_end_n + +- type: decal + id: GrayConcreteTrimEndE + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: grayconcrete_end_e + +- type: decal + id: GrayConcreteTrimEndS + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: grayconcrete_end_s + +- type: decal + id: GrayConcreteTrimEndW + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: grayconcrete_end_w + +- type: decal + id: GrayConcreteTrimLineN + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: grayconcrete_line_n + +- type: decal + id: GrayConcreteTrimLineE + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: grayconcrete_line_e + +- type: decal + id: GrayConcreteTrimLineS + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: grayconcrete_line_s + +- type: decal + id: GrayConcreteTrimLineW + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: grayconcrete_line_w + +- type: decal + id: OldConcreteTrimBox + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: oldconcrete_box + +- type: decal + id: OldConcreteTrimCornerNe + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: oldconcrete_corner_ne + +- type: decal + id: OldConcreteTrimCornerSe + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: oldconcrete_corner_se + +- type: decal + id: OldConcreteTrimCornerNw + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: oldconcrete_corner_nw + +- type: decal + id: OldConcreteTrimCornerSw + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: oldconcrete_corner_sw + +- type: decal + id: OldConcreteTrimInnerNe + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: oldconcrete_inner_ne + +- type: decal + id: OldConcreteTrimInnerSe + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: oldconcrete_inner_se + +- type: decal + id: OldConcreteTrimInnerNw + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: oldconcrete_inner_nw + +- type: decal + id: OldConcreteTrimInnerSw + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: oldconcrete_inner_sw + +- type: decal + id: OldConcreteTrimEndN + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: oldconcrete_end_n + +- type: decal + id: OldConcreteTrimEndE + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: oldconcrete_end_e + +- type: decal + id: OldConcreteTrimEndS + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: oldconcrete_end_s + +- type: decal + id: OldConcreteTrimEndW + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: oldconcrete_end_w + +- type: decal + id: OldConcreteTrimLineN + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: oldconcrete_line_n + +- type: decal + id: OldConcreteTrimLineE + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: oldconcrete_line_e + +- type: decal + id: OldConcreteTrimLineS + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: oldconcrete_line_s + +- type: decal + id: OldConcreteTrimLineW + tags: ["planet", "markings"] + sprite: + sprite: Decals/concretetrim.rsi + state: oldconcrete_line_w diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index f13bb59e67..523a7cf7e9 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -418,6 +418,55 @@ - type: Stack stackType: FloorTileLaundry +# Concrete +- type: entity + parent: FloorTileItemBase + id: FloorTileItemConcrete + name: concrete tile + components: + - type: Sprite + state: concrete + - type: Item + heldPrefix: generic + - type: FloorTile + outputs: + - Plating + - FloorConcrete + - type: Stack + stackType: FloorTileConcrete + +- type: entity + parent: FloorTileItemBase + id: FloorTileItemGrayConcrete + name: gray concrete tile + components: + - type: Sprite + state: grayconcrete + - type: Item + heldPrefix: generic + - type: FloorTile + outputs: + - Plating + - FloorGrayConcrete + - type: Stack + stackType: FloorTileGrayConcrete + +- type: entity + parent: FloorTileItemBase + id: FloorTileItemOldConcrete + name: old concrete tile + components: + - type: Sprite + state: oldconcrete + - type: Item + heldPrefix: generic + - type: FloorTile + outputs: + - Plating + - FloorOldConcrete + - type: Stack + stackType: FloorTileOldConcrete + # Carpets - type: entity name: blue arcade floor diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index 5b69430500..34065fa53f 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -306,6 +306,27 @@ maxCount: 30 itemSize: 5 +- type: stack + id: FloorTileConcrete + name: concrete tile + spawn: FloorTileItemGrayConcrete + maxCount: 30 + itemSize: 5 + +- type: stack + id: FloorTileGrayConcrete + name: gray concrete tile + spawn: FloorTileItemLaundry + maxCount: 30 + itemSize: 5 + +- type: stack + id: FloorTileOldConcrete + name: old concrete tile + spawn: FloorTileItemOldConcrete + maxCount: 30 + itemSize: 5 + - type: stack id: FloorTileSilver name: silver floor tile diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 84116aa4cb..908cd466a3 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -787,6 +787,178 @@ itemDrop: FloorTileItemLaundry heatCapacity: 10000 +# Concrete +- type: tile + id: FloorConcrete + name: tiles-concrete-tile + sprite: /Textures/Tiles/Planet/Concrete/concrete.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + canCrowbar: true + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemConcrete + heatCapacity: 10000 + weather: true + +- type: tile + id: FloorConcreteMono + name: tiles-concrete-slab + sprite: /Textures/Tiles/Planet/Concrete/concrete_mono.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + canCrowbar: true + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemConcrete + heatCapacity: 10000 + weather: true + +- type: tile + id: FloorConcreteSmooth + name: tiles-concrete-smooth + sprite: /Textures/Tiles/Planet/Concrete/concrete_smooth.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + canCrowbar: true + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemConcrete + heatCapacity: 10000 + weather: true + +- type: tile + id: FloorGrayConcrete + name: tiles-gray-concrete-tile + sprite: /Textures/Tiles/Planet/Concrete/grayconcrete.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + canCrowbar: true + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemGrayConcrete + heatCapacity: 10000 + weather: true + +- type: tile + id: FloorGrayConcreteMono + name: tiles-gray-concrete-slab + sprite: /Textures/Tiles/Planet/Concrete/grayconcrete_mono.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + canCrowbar: true + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemGrayConcrete + heatCapacity: 10000 + weather: true + +- type: tile + id: FloorGrayConcreteSmooth + name: tiles-gray-concrete-smooth + sprite: /Textures/Tiles/Planet/Concrete/grayconcrete_smooth.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + canCrowbar: true + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemGrayConcrete + heatCapacity: 10000 + weather: true + +- type: tile + id: FloorOldConcrete + name: tiles-old-concrete-tile + sprite: /Textures/Tiles/Planet/Concrete/oldconcrete.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + canCrowbar: true + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemOldConcrete + heatCapacity: 10000 + weather: true + +- type: tile + id: FloorOldConcreteMono + name: tiles-old-concrete-slab + sprite: /Textures/Tiles/Planet/Concrete/oldconcrete_mono.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + canCrowbar: true + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemOldConcrete + heatCapacity: 10000 + weather: true + +- type: tile + id: FloorOldConcreteSmooth + name: tiles-old-concrete-smooth + sprite: /Textures/Tiles/Planet/Concrete/oldconcrete_smooth.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + canCrowbar: true + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemOldConcrete + heatCapacity: 10000 + weather: true + # Carpets (non smoothing) - type: tile id: FloorArcadeBlue @@ -1065,6 +1237,30 @@ heatCapacity: 10000 # Terrain +- type: tile + id: FloorAsphalt + name: tiles-asphalt + sprite: /Textures/Tiles/Planet/Concrete/asphalt.png + variants: 10 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: FloorDirt + isSubfloor: true + canCrowbar: false + footstepSounds: + collection: FootstepTile + heatCapacity: 10000 + weather: true + - type: tile id: FloorGrass name: tiles-planet-grass-floor diff --git a/Resources/Textures/Decals/concretetrim.rsi/concrete_box.png b/Resources/Textures/Decals/concretetrim.rsi/concrete_box.png new file mode 100644 index 0000000000..534e6ea9e7 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/concrete_box.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/concrete_corner_ne.png b/Resources/Textures/Decals/concretetrim.rsi/concrete_corner_ne.png new file mode 100644 index 0000000000..a82c3a9aaa Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/concrete_corner_ne.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/concrete_corner_nw.png b/Resources/Textures/Decals/concretetrim.rsi/concrete_corner_nw.png new file mode 100644 index 0000000000..516859190e Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/concrete_corner_nw.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/concrete_corner_se.png b/Resources/Textures/Decals/concretetrim.rsi/concrete_corner_se.png new file mode 100644 index 0000000000..50ece48265 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/concrete_corner_se.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/concrete_corner_sw.png b/Resources/Textures/Decals/concretetrim.rsi/concrete_corner_sw.png new file mode 100644 index 0000000000..a0cdd1fe1b Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/concrete_corner_sw.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/concrete_end_e.png b/Resources/Textures/Decals/concretetrim.rsi/concrete_end_e.png new file mode 100644 index 0000000000..8d152b940d Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/concrete_end_e.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/concrete_end_n.png b/Resources/Textures/Decals/concretetrim.rsi/concrete_end_n.png new file mode 100644 index 0000000000..6171178717 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/concrete_end_n.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/concrete_end_s.png b/Resources/Textures/Decals/concretetrim.rsi/concrete_end_s.png new file mode 100644 index 0000000000..f35a393411 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/concrete_end_s.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/concrete_end_w.png b/Resources/Textures/Decals/concretetrim.rsi/concrete_end_w.png new file mode 100644 index 0000000000..9fa7e3d2af Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/concrete_end_w.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/concrete_inner_ne.png b/Resources/Textures/Decals/concretetrim.rsi/concrete_inner_ne.png new file mode 100644 index 0000000000..b35ef9cbce Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/concrete_inner_ne.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/concrete_inner_nw.png b/Resources/Textures/Decals/concretetrim.rsi/concrete_inner_nw.png new file mode 100644 index 0000000000..68007e25f6 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/concrete_inner_nw.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/concrete_inner_se.png b/Resources/Textures/Decals/concretetrim.rsi/concrete_inner_se.png new file mode 100644 index 0000000000..4e711962f9 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/concrete_inner_se.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/concrete_inner_sw.png b/Resources/Textures/Decals/concretetrim.rsi/concrete_inner_sw.png new file mode 100644 index 0000000000..27a4be224d Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/concrete_inner_sw.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/concrete_line_e.png b/Resources/Textures/Decals/concretetrim.rsi/concrete_line_e.png new file mode 100644 index 0000000000..43d739faa4 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/concrete_line_e.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/concrete_line_n.png b/Resources/Textures/Decals/concretetrim.rsi/concrete_line_n.png new file mode 100644 index 0000000000..04a435ad0e Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/concrete_line_n.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/concrete_line_s.png b/Resources/Textures/Decals/concretetrim.rsi/concrete_line_s.png new file mode 100644 index 0000000000..e3a7c43031 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/concrete_line_s.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/concrete_line_w.png b/Resources/Textures/Decals/concretetrim.rsi/concrete_line_w.png new file mode 100644 index 0000000000..334a9ae7de Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/concrete_line_w.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_box.png b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_box.png new file mode 100644 index 0000000000..cd7a9399dc Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_box.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_corner_ne.png b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_corner_ne.png new file mode 100644 index 0000000000..eb44d90941 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_corner_ne.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_corner_nw.png b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_corner_nw.png new file mode 100644 index 0000000000..181c0b25e7 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_corner_nw.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_corner_se.png b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_corner_se.png new file mode 100644 index 0000000000..446a92a999 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_corner_se.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_corner_sw.png b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_corner_sw.png new file mode 100644 index 0000000000..b36ddeb4d1 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_corner_sw.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_end_e.png b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_end_e.png new file mode 100644 index 0000000000..545434f4b1 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_end_e.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_end_n.png b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_end_n.png new file mode 100644 index 0000000000..944a240da5 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_end_n.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_end_s.png b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_end_s.png new file mode 100644 index 0000000000..b1f9487780 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_end_s.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_end_w.png b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_end_w.png new file mode 100644 index 0000000000..0600e7b8f6 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_end_w.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_inner_ne.png b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_inner_ne.png new file mode 100644 index 0000000000..746bae4450 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_inner_ne.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_inner_nw.png b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_inner_nw.png new file mode 100644 index 0000000000..a6c9eee360 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_inner_nw.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_inner_se.png b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_inner_se.png new file mode 100644 index 0000000000..ddf69f6b25 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_inner_se.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_inner_sw.png b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_inner_sw.png new file mode 100644 index 0000000000..96088574ec Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_inner_sw.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_line_e.png b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_line_e.png new file mode 100644 index 0000000000..05fe9beec5 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_line_e.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_line_n.png b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_line_n.png new file mode 100644 index 0000000000..87a57df56d Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_line_n.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_line_s.png b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_line_s.png new file mode 100644 index 0000000000..fc59cd61ee Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_line_s.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_line_w.png b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_line_w.png new file mode 100644 index 0000000000..72c9c2688d Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/grayconcrete_line_w.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/meta.json b/Resources/Textures/Decals/concretetrim.rsi/meta.json new file mode 100644 index 0000000000..2c43f0042d --- /dev/null +++ b/Resources/Textures/Decals/concretetrim.rsi/meta.json @@ -0,0 +1,164 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404 (github) for Space Station 14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "concrete_box" + }, + { + "name": "concrete_corner_ne" + }, + { + "name": "concrete_corner_se" + }, + { + "name": "concrete_corner_nw" + }, + { + "name": "concrete_corner_sw" + }, + { + "name": "concrete_end_n" + }, + { + "name": "concrete_end_e" + }, + { + "name": "concrete_end_s" + }, + { + "name": "concrete_end_w" + }, + { + "name": "concrete_line_n" + }, + { + "name": "concrete_line_e" + }, + { + "name": "concrete_line_s" + }, + { + "name": "concrete_line_w" + }, + { + "name": "concrete_inner_ne" + }, + { + "name": "concrete_inner_se" + }, + { + "name": "concrete_inner_nw" + }, + { + "name": "concrete_inner_sw" + }, + { + "name": "oldconcrete_box" + }, + { + "name": "oldconcrete_corner_ne" + }, + { + "name": "oldconcrete_corner_se" + }, + { + "name": "oldconcrete_corner_nw" + }, + { + "name": "oldconcrete_corner_sw" + }, + { + "name": "oldconcrete_end_n" + }, + { + "name": "oldconcrete_end_e" + }, + { + "name": "oldconcrete_end_s" + }, + { + "name": "oldconcrete_end_w" + }, + { + "name": "oldconcrete_line_n" + }, + { + "name": "oldconcrete_line_e" + }, + { + "name": "oldconcrete_line_s" + }, + { + "name": "oldconcrete_line_w" + }, + { + "name": "oldconcrete_inner_ne" + }, + { + "name": "oldconcrete_inner_se" + }, + { + "name": "oldconcrete_inner_nw" + }, + { + "name": "oldconcrete_inner_sw" + }, + { + "name": "grayconcrete_box" + }, + { + "name": "grayconcrete_corner_ne" + }, + { + "name": "grayconcrete_corner_se" + }, + { + "name": "grayconcrete_corner_nw" + }, + { + "name": "grayconcrete_corner_sw" + }, + { + "name": "grayconcrete_end_n" + }, + { + "name": "grayconcrete_end_e" + }, + { + "name": "grayconcrete_end_s" + }, + { + "name": "grayconcrete_end_w" + }, + { + "name": "grayconcrete_line_n" + }, + { + "name": "grayconcrete_line_e" + }, + { + "name": "grayconcrete_line_s" + }, + { + "name": "grayconcrete_line_w" + }, + { + "name": "grayconcrete_inner_ne" + }, + { + "name": "grayconcrete_inner_se" + }, + { + "name": "grayconcrete_inner_nw" + }, + { + "name": "grayconcrete_inner_sw" + } + ] +} diff --git a/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_box.png b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_box.png new file mode 100644 index 0000000000..0e32ec59d5 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_box.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_corner_ne.png b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_corner_ne.png new file mode 100644 index 0000000000..ec12eb94b4 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_corner_ne.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_corner_nw.png b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_corner_nw.png new file mode 100644 index 0000000000..d4b7d57735 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_corner_nw.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_corner_se.png b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_corner_se.png new file mode 100644 index 0000000000..e91e805a2b Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_corner_se.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_corner_sw.png b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_corner_sw.png new file mode 100644 index 0000000000..70940549d0 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_corner_sw.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_end_e.png b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_end_e.png new file mode 100644 index 0000000000..95ee21d367 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_end_e.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_end_n.png b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_end_n.png new file mode 100644 index 0000000000..a7e0dd604e Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_end_n.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_end_s.png b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_end_s.png new file mode 100644 index 0000000000..41e4324b08 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_end_s.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_end_w.png b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_end_w.png new file mode 100644 index 0000000000..af7804804c Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_end_w.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_inner_ne.png b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_inner_ne.png new file mode 100644 index 0000000000..9721fbfa6f Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_inner_ne.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_inner_nw.png b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_inner_nw.png new file mode 100644 index 0000000000..6cb3b7cd4f Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_inner_nw.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_inner_se.png b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_inner_se.png new file mode 100644 index 0000000000..4ca0b438e9 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_inner_se.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_inner_sw.png b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_inner_sw.png new file mode 100644 index 0000000000..a9e7c87887 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_inner_sw.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_line_e.png b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_line_e.png new file mode 100644 index 0000000000..d0153f54d6 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_line_e.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_line_n.png b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_line_n.png new file mode 100644 index 0000000000..d7d998bf56 Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_line_n.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_line_s.png b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_line_s.png new file mode 100644 index 0000000000..502e0c605a Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_line_s.png differ diff --git a/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_line_w.png b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_line_w.png new file mode 100644 index 0000000000..5d2160260d Binary files /dev/null and b/Resources/Textures/Decals/concretetrim.rsi/oldconcrete_line_w.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/concrete.png b/Resources/Textures/Objects/Tiles/tile.rsi/concrete.png new file mode 100644 index 0000000000..4ac52bcc10 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/concrete.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete.png b/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete.png new file mode 100644 index 0000000000..aac429e862 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index 7595661407..26be33981a 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "checker-dark" }, + { + "name": "concrete" + }, + { + "name": "grayconcrete" + }, + { + "name": "oldconcrete" + }, { "name": "gcircuit" }, diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete.png b/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete.png new file mode 100644 index 0000000000..1343e70e2b Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete.png differ diff --git a/Resources/Textures/Tiles/Planet/Concrete/asphalt.png b/Resources/Textures/Tiles/Planet/Concrete/asphalt.png new file mode 100644 index 0000000000..e581151524 Binary files /dev/null and b/Resources/Textures/Tiles/Planet/Concrete/asphalt.png differ diff --git a/Resources/Textures/Tiles/Planet/Concrete/attributions.yml b/Resources/Textures/Tiles/Planet/Concrete/attributions.yml new file mode 100644 index 0000000000..00411ebbef --- /dev/null +++ b/Resources/Textures/Tiles/Planet/Concrete/attributions.yml @@ -0,0 +1,9 @@ +- files: ["asphalt.png", "oldconcrete.png", "oldconcrete_mono.png", "oldconcrete_smooth.png"] + license: "CC-BY-SA-3.0" + copyright: "Taken from vgstation13, modified by EmoGarbage404 (github)" + source: "https://github.com/vgstation-coders/vgstation13/commit/02b9f6894af4419c9f7e699a22c402b086d8067e" + +- files: ["concrete.png", "concrete_mono.png", "concrete_smooth.png", "grayconcrete.png", "grayconcrete_mono.png", "grayconcrete_smooth.png"] + license: "CC-BY-NC-SA-3.0" + copyright: "Taken from goonstation, modified by EmoGarbage404 (github)" + source: "https://github.com/goonstation/goonstation/commit/1a76b08389014ec88f703fdb1ae916c2a6e57bd8" \ No newline at end of file diff --git a/Resources/Textures/Tiles/Planet/Concrete/concrete.png b/Resources/Textures/Tiles/Planet/Concrete/concrete.png new file mode 100644 index 0000000000..0362237aa7 Binary files /dev/null and b/Resources/Textures/Tiles/Planet/Concrete/concrete.png differ diff --git a/Resources/Textures/Tiles/Planet/Concrete/concrete_mono.png b/Resources/Textures/Tiles/Planet/Concrete/concrete_mono.png new file mode 100644 index 0000000000..d06df74eb9 Binary files /dev/null and b/Resources/Textures/Tiles/Planet/Concrete/concrete_mono.png differ diff --git a/Resources/Textures/Tiles/Planet/Concrete/concrete_smooth.png b/Resources/Textures/Tiles/Planet/Concrete/concrete_smooth.png new file mode 100644 index 0000000000..fe5f77bab0 Binary files /dev/null and b/Resources/Textures/Tiles/Planet/Concrete/concrete_smooth.png differ diff --git a/Resources/Textures/Tiles/Planet/Concrete/grayconcrete.png b/Resources/Textures/Tiles/Planet/Concrete/grayconcrete.png new file mode 100644 index 0000000000..30dbbeed56 Binary files /dev/null and b/Resources/Textures/Tiles/Planet/Concrete/grayconcrete.png differ diff --git a/Resources/Textures/Tiles/Planet/Concrete/grayconcrete_mono.png b/Resources/Textures/Tiles/Planet/Concrete/grayconcrete_mono.png new file mode 100644 index 0000000000..48b1bfc70d Binary files /dev/null and b/Resources/Textures/Tiles/Planet/Concrete/grayconcrete_mono.png differ diff --git a/Resources/Textures/Tiles/Planet/Concrete/grayconcrete_smooth.png b/Resources/Textures/Tiles/Planet/Concrete/grayconcrete_smooth.png new file mode 100644 index 0000000000..f39130e6b8 Binary files /dev/null and b/Resources/Textures/Tiles/Planet/Concrete/grayconcrete_smooth.png differ diff --git a/Resources/Textures/Tiles/Planet/Concrete/oldconcrete.png b/Resources/Textures/Tiles/Planet/Concrete/oldconcrete.png new file mode 100644 index 0000000000..2212a7c84c Binary files /dev/null and b/Resources/Textures/Tiles/Planet/Concrete/oldconcrete.png differ diff --git a/Resources/Textures/Tiles/Planet/Concrete/oldconcrete_mono.png b/Resources/Textures/Tiles/Planet/Concrete/oldconcrete_mono.png new file mode 100644 index 0000000000..5d7755228d Binary files /dev/null and b/Resources/Textures/Tiles/Planet/Concrete/oldconcrete_mono.png differ diff --git a/Resources/Textures/Tiles/Planet/Concrete/oldconcrete_smooth.png b/Resources/Textures/Tiles/Planet/Concrete/oldconcrete_smooth.png new file mode 100644 index 0000000000..51a7f822fc Binary files /dev/null and b/Resources/Textures/Tiles/Planet/Concrete/oldconcrete_smooth.png differ