cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds a full range of tatami designs to the Tile Painter (#33147)

Browse Source 
* added the full range of green and yellow tatami floor tiles to floors.dmi

* Updates dojo floor tiles to use new icon state name

* Adds Tatami to the tile painter, makes the halfmats a single icon with directional states

* Fixes dojo walls that were ruined by the smoothing process
This commit is contained in:
ValkyrieSkies
2022-09-02 03:26:52 +01:00
committed by GitHub
parent a9176d432d
commit ce21868ac7
3 changed files with 55 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/modules/RCD/schematics/tile.dm
View File

@@ -317,6 +317,9 @@
/datum/rcd_schematic/tile/chapel
name = "Chapel"
/datum/rcd_schematic/tile/tatami
name = "Tatami"
/datum/rcd_schematic/tile/ss13_logo
name = "SS13 logo"
@@ -608,6 +611,23 @@ var/global/list/paint_variants = list(
new /datum/paint_info(DIR_ALL, "chapel"),
new /datum/paint_info(DIR_ONE, "chapeldark")
),
"Tatami" = list(
new /datum/paint_info(DIR_ORTHO, "tatami-green-halfmat"),
new /datum/paint_info(DIR_ONE, "tatami-green-1mat-hori"),
new /datum/paint_info(DIR_ONE, "tatami-green-1mat-verti"),
new /datum/paint_info(DIR_ONE, "tatami-green-2mat-hori"),
new /datum/paint_info(DIR_ONE, "tatami-green-2mat-verti"),
new /datum/paint_info(DIR_ORTHO, "tatami-green-3mat"),
new /datum/paint_info(DIR_ONE, "tatami-green-spiral"),
new /datum/paint_info(DIR_ORTHO, "tatami-yellow-halfmat"),
new /datum/paint_info(DIR_ONE, "tatami-yellow-1mat-hori"),
new /datum/paint_info(DIR_ONE, "tatami-yellow-1mat-verti"),
new /datum/paint_info(DIR_ONE, "tatami-yellow-2mat-hori"),
new /datum/paint_info(DIR_ONE, "tatami-yellow-2mat-verti"),
new /datum/paint_info(DIR_ORTHO, "tatami-yellow-3mat"),
new /datum/paint_info(DIR_ONE, "tatami-yellow-spiral"),
),
"SS13 logo" = list(
new /datum/paint_info(DIR_ONE, "L1"),

BIN
icons/turf/floors.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 478 KiB

After

Width:  |  Height:  |  Size: 473 KiB

69
maps/misc/dojo.dmm
View File

@@ -1,48 +1,48 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/obj/structure/trophy_mount,
/turf/simulated/wall/invulnerable{
/turf/simulated/wall/shuttle/unsmoothed/black{
icon = 'icons/turf/walls.dmi';
icon_state = "shoji";
name = "shoji wall";
desc = "Despite popular belief, shoji walls are not actually made from rice paper. This incorrect piece of trivia likely caught on because it sounded more oriental."
name = "shoji wall"
},
/area/dojo)
"b" = (
/obj/structure/sign/vacuum,
/turf/simulated/wall/invulnerable{
/turf/simulated/wall/shuttle/unsmoothed/black{
icon = 'icons/turf/walls.dmi';
icon_state = "shoji";
name = "shoji wall";
desc = "Despite popular belief, shoji walls are not actually made from rice paper. This incorrect piece of trivia likely caught on because it sounded more oriental."
name = "shoji wall"
},
/area/dojo)
"c" = (
/obj/structure/button/ninja/launcher,
/turf/simulated/wall/invulnerable{
/turf/simulated/wall/shuttle/unsmoothed/black{
icon = 'icons/turf/walls.dmi';
icon_state = "shoji";
name = "shoji wall";
desc = "Despite popular belief, shoji walls are not actually made from rice paper. This incorrect piece of trivia likely caught on because it sounded more oriental."
name = "shoji wall"
},
/area/dojo)
"d" = (
/obj/structure/sign/chinese/restricted_area,
/turf/simulated/wall/invulnerable{
/turf/simulated/wall/shuttle/unsmoothed/black{
icon = 'icons/turf/walls.dmi';
icon_state = "shoji";
name = "shoji wall";
desc = "Despite popular belief, shoji walls are not actually made from rice paper. This incorrect piece of trivia likely caught on because it sounded more oriental."
name = "shoji wall"
},
/area/dojo)
"e" = (
/obj/structure/button/ninja/teleporter,
/turf/simulated/wall/invulnerable{
/turf/simulated/wall/shuttle/unsmoothed/black{
icon = 'icons/turf/walls.dmi';
icon_state = "shoji";
name = "shoji wall";
desc = "Despite popular belief, shoji walls are not actually made from rice paper. This incorrect piece of trivia likely caught on because it sounded more oriental."
name = "shoji wall"
},
/area/dojo)
"f" = (
/obj/structure/table/woodentable,
/turf/simulated/floor{
icon_state = "tatami";
icon_state = "tatami-green-spiral";
name = "tatami mat"
},
/area/dojo)
@@ -74,7 +74,7 @@
pixel_y = -6
},
/turf/simulated/floor{
icon_state = "tatami";
icon_state = "tatami-green-spiral";
name = "tatami mat"
},
/area/dojo)
@@ -105,7 +105,7 @@
pixel_y = 8
},
/turf/simulated/floor{
icon_state = "tatami";
icon_state = "tatami-green-spiral";
name = "tatami mat"
},
/area/dojo)
@@ -117,7 +117,7 @@
name = "ninjastart"
},
/turf/simulated/floor{
icon_state = "tatami";
icon_state = "tatami-green-spiral";
name = "tatami mat"
},
/area/dojo)
@@ -128,7 +128,7 @@
/area/dojo)
"o" = (
/turf/simulated/floor{
icon_state = "tatami";
icon_state = "tatami-green-spiral";
name = "tatami mat"
},
/area/dojo)
@@ -139,24 +139,25 @@
/area/dojo)
"q" = (
/obj/effect/decal/arrow,
/turf/simulated/wall/invulnerable{
/turf/simulated/wall/shuttle/unsmoothed/black{
icon = 'icons/turf/walls.dmi';
icon_state = "shoji";
name = "shoji wall";
desc = "Despite popular belief, shoji walls are not actually made from rice paper. This incorrect piece of trivia likely caught on because it sounded more oriental."
name = "shoji wall"
},
/area/dojo)
"r" = (
/turf/simulated/wall/invulnerable{
/turf/simulated/wall/shuttle/unsmoothed/black{
icon = 'icons/turf/walls.dmi';
icon_state = "wood0";
name = "sturdy wooden wall";
desc = "Legendary oriental lumber, folded over 2 times."
desc = "Legendary Japanese lumber, folded over 2 times."
},
/area/dojo)
"s" = (
/turf/simulated/wall/invulnerable{
/turf/simulated/wall/shuttle/unsmoothed/black{
icon = 'icons/turf/walls.dmi';
icon_state = "shoji";
name = "shoji wall";
desc = "Despite popular belief, shoji walls are not actually made from rice paper. This incorrect piece of trivia likely caught on because it sounded more oriental."
name = "shoji wall"
},
/area/dojo)
"t" = (
@@ -164,7 +165,7 @@
pixel_y = 8
},
/turf/simulated/floor{
icon_state = "tatami";
icon_state = "tatami-green-spiral";
name = "tatami mat"
},
/area/dojo)
@@ -176,16 +177,16 @@
desc = "Great for practicing your ninja skills."
},
/turf/simulated/floor{
icon_state = "tatami";
icon_state = "tatami-green-spiral";
name = "tatami mat"
},
/area/dojo)
"z" = (
/obj/structure/sign/ninjaglove,
/turf/simulated/wall/invulnerable{
/turf/simulated/wall/shuttle/unsmoothed/black{
icon = 'icons/turf/walls.dmi';
icon_state = "shoji";
name = "shoji wall";
desc = "Despite popular belief, shoji walls are not actually made from rice paper. This incorrect piece of trivia likely caught on because it sounded more oriental."
name = "shoji wall"
},
/area/dojo)
"A" = (
@@ -199,7 +200,7 @@
name = "Vault Door"
},
/turf/simulated/floor{
icon_state = "tatami";
icon_state = "tatami-green-spiral";
name = "tatami mat"
},
/area/dojo)