diff --git a/code/game/turfs/simulated/wall/subtypes/rt_medieval.dm b/code/game/turfs/simulated/wall/subtypes/rt_medieval.dm index 80f3d4f3d10..9ba4ecd7713 100644 --- a/code/game/turfs/simulated/wall/subtypes/rt_medieval.dm +++ b/code/game/turfs/simulated/wall/subtypes/rt_medieval.dm @@ -12,6 +12,10 @@ abstract_type = /turf/simulated/wall/rt_medieval integrity_flags = INTEGRITY_INDESTRUCTIBLE material_system = FALSE + base_icon_state = "wall" + icon_state = "wall-0" + // needed due to base wall being steel :/ + color = null // TODO: destructible sprites, consturction, shift these slowly into // materials system. wall themes/styles? @@ -21,46 +25,38 @@ name = "archaic terrain wall" desc = "You don't how this was made, but it doesn't look very welcoming." icon = 'icons/turf/walls/rt_medieval/boss.dmi' - icon_state = "boss" - -/turf/simulated/wall/rt_medieval/brick - name = "archaic brick wall" - desc = "An archaic wall made from brick. It looks sturdy." - icon = 'icons/turf/walls/rt_medieval/brick.dmi' - icon_state = "brick" /turf/simulated/wall/rt_medieval/stone name = "archaic stone wall" desc = "An archaic wall made from stone. It looks sturdy." icon = 'icons/turf/walls/rt_medieval/stone.dmi' - icon_state = "stone" /turf/simulated/wall/rt_medieval/stone/brick name = "archaic stone brick wall" desc = "An archaic wall made from stone brick. It looks sturdy." icon = 'icons/turf/walls/rt_medieval/stone/brick.dmi' - icon_state = "stone_brick" /turf/simulated/wall/rt_medieval/stone/craft name = "archaic craft stone wall" desc = "An archaic wall made from textured stone. It looks sturdy." icon = 'icons/turf/walls/rt_medieval/stone/craft.dmi' - icon_state = "stone_craft" /turf/simulated/wall/rt_medieval/stone/moss_red name = "archaic mossy stone wall" desc = "An archaic wall made from stone. It looks sturdy." icon = 'icons/turf/walls/rt_medieval/stone/moss_red.dmi' - icon_state = "stone_moss_red" + +/turf/simulated/wall/rt_medieval/stone/moss_green + name = "archaic mossy stone wall" + desc = "An archaic wall made from stone. It looks sturdy." + icon = 'icons/turf/walls/rt_medieval/stone/moss_green.dmi' /turf/simulated/wall/rt_medieval/stone/moss_blue name = "archaic mossy stone wall" desc = "An archaic wall made from stone. It looks sturdy." icon = 'icons/turf/walls/rt_medieval/stone/moss_blue.dmi' - icon_state = "stone_moss_blue" /turf/simulated/wall/rt_medieval/wood name = "archaic wooden wall" desc = "An archaic wall made from wood. It looks sturdy." icon = 'icons/turf/walls/rt_medieval/wood.dmi' - icon_state = "wood" diff --git a/code/game/turfs/simulated/wall/wall.dm b/code/game/turfs/simulated/wall/wall.dm index 9ac982d1884..f22e52ca478 100644 --- a/code/game/turfs/simulated/wall/wall.dm +++ b/code/game/turfs/simulated/wall/wall.dm @@ -3,6 +3,8 @@ * Surely, *surely*, such a nice, amazing thing wouldn't be entirely shitcode. * Right? * + * TODO: /turf/simulated/wall/material; do not have steel defines on base. + * * ## Material System * * By default, walls are made out of /datum/material's. diff --git a/icon_cutter_templates/README.md b/icon_cutter_templates/README.md new file mode 100644 index 00000000000..3b590419f23 --- /dev/null +++ b/icon_cutter_templates/README.md @@ -0,0 +1,3 @@ +# Icon cutter templates + +Templates for the automated icon cutter. diff --git a/cutter_templates/bitmask/cardinal_32x32.toml b/icon_cutter_templates/bitmask/cardinal_32x32.toml similarity index 100% rename from cutter_templates/bitmask/cardinal_32x32.toml rename to icon_cutter_templates/bitmask/cardinal_32x32.toml diff --git a/cutter_templates/bitmask/diagonal_32x32.toml b/icon_cutter_templates/bitmask/diagonal_32x32.toml similarity index 100% rename from cutter_templates/bitmask/diagonal_32x32.toml rename to icon_cutter_templates/bitmask/diagonal_32x32.toml diff --git a/cutter_templates/bitmask/wall_32x32.toml b/icon_cutter_templates/bitmask/wall_32x32.toml similarity index 100% rename from cutter_templates/bitmask/wall_32x32.toml rename to icon_cutter_templates/bitmask/wall_32x32.toml diff --git a/icon_cutter_templates/impl/README.md b/icon_cutter_templates/impl/README.md new file mode 100644 index 00000000000..b93111448c7 --- /dev/null +++ b/icon_cutter_templates/impl/README.md @@ -0,0 +1,3 @@ +# Implementation Templates + +Organized templates for Citadel RP's features. diff --git a/icon_cutter_templates/impl/wall/rt_medieval.toml b/icon_cutter_templates/impl/wall/rt_medieval.toml new file mode 100644 index 00000000000..669c61969f5 --- /dev/null +++ b/icon_cutter_templates/impl/wall/rt_medieval.toml @@ -0,0 +1,14 @@ +template = "impl/wall_default.toml" + +output_name = "wall" +smooth_diagonally = false + +[positions] +convex = 0 +horizontal = 1 +vertical = 2 +concave = 3 + +[cut_pos] +x = 16 +y = 16 diff --git a/icon_cutter_templates/impl/wall_default.toml b/icon_cutter_templates/impl/wall_default.toml new file mode 100644 index 00000000000..e93ddc65001 --- /dev/null +++ b/icon_cutter_templates/impl/wall_default.toml @@ -0,0 +1,14 @@ +mode = "BitmaskSlice" +produce_dirs = false + +[icon_size] +x = 32 +y = 32 + +[output_icon_pos] +x = 0 +y = 0 + +[output_icon_size] +x = 32 +y = 32 diff --git a/icons/turf/walls/rt_medieval/boss.dmi b/icons/turf/walls/rt_medieval/boss.dmi index c6837667361..28e9a590c19 100644 Binary files a/icons/turf/walls/rt_medieval/boss.dmi and b/icons/turf/walls/rt_medieval/boss.dmi differ diff --git a/icons/turf/walls/rt_medieval/boss.png b/icons/turf/walls/rt_medieval/boss.png new file mode 100644 index 00000000000..4eb0867aa04 Binary files /dev/null and b/icons/turf/walls/rt_medieval/boss.png differ diff --git a/icons/turf/walls/rt_medieval/boss.png.toml b/icons/turf/walls/rt_medieval/boss.png.toml new file mode 100644 index 00000000000..77f5cc801bb --- /dev/null +++ b/icons/turf/walls/rt_medieval/boss.png.toml @@ -0,0 +1,10 @@ +template = "impl/wall/rt_medieval.toml" + +smooth_diagonally = true + +[positions] +convex = 0 +vertical = 1 +horizontal = 2 +concave = 3 +flat = 4 diff --git a/icons/turf/walls/rt_medieval/brick.dmi b/icons/turf/walls/rt_medieval/brick.dmi deleted file mode 100644 index 1cf6638262f..00000000000 Binary files a/icons/turf/walls/rt_medieval/brick.dmi and /dev/null differ diff --git a/icons/turf/walls/rt_medieval/stone.dmi b/icons/turf/walls/rt_medieval/stone.dmi index 9eb04fc7a3f..89a111f443a 100644 Binary files a/icons/turf/walls/rt_medieval/stone.dmi and b/icons/turf/walls/rt_medieval/stone.dmi differ diff --git a/icons/turf/walls/rt_medieval/stone.png b/icons/turf/walls/rt_medieval/stone.png new file mode 100644 index 00000000000..bcbac709202 Binary files /dev/null and b/icons/turf/walls/rt_medieval/stone.png differ diff --git a/icons/turf/walls/rt_medieval/stone.png.toml b/icons/turf/walls/rt_medieval/stone.png.toml new file mode 100644 index 00000000000..9e454ee970c --- /dev/null +++ b/icons/turf/walls/rt_medieval/stone.png.toml @@ -0,0 +1,10 @@ +template = "impl/wall/rt_medieval.toml" + +smooth_diagonally = true + +[positions] +convex = 0 +vertical = 1 +horizontal = 2 +flat = 3 +concave = 4 diff --git a/icons/turf/walls/rt_medieval/stone/brick.dmi b/icons/turf/walls/rt_medieval/stone/brick.dmi index 0c092328789..556fb08336d 100644 Binary files a/icons/turf/walls/rt_medieval/stone/brick.dmi and b/icons/turf/walls/rt_medieval/stone/brick.dmi differ diff --git a/icons/turf/walls/rt_medieval/stone/brick.png b/icons/turf/walls/rt_medieval/stone/brick.png new file mode 100644 index 00000000000..aa1b380045f Binary files /dev/null and b/icons/turf/walls/rt_medieval/stone/brick.png differ diff --git a/icons/turf/walls/rt_medieval/stone/brick.png.toml b/icons/turf/walls/rt_medieval/stone/brick.png.toml new file mode 100644 index 00000000000..a1916f9133e --- /dev/null +++ b/icons/turf/walls/rt_medieval/stone/brick.png.toml @@ -0,0 +1,10 @@ +template = "impl/wall/rt_medieval.toml" + +smooth_diagonally = true + +[positions] +convex = 1 +vertical = 4 +horizontal = 0 +concave = 3 +flat = 2 diff --git a/icons/turf/walls/rt_medieval/stone/craft.dmi b/icons/turf/walls/rt_medieval/stone/craft.dmi index 34318c60cc2..9ae0e3e44fc 100644 Binary files a/icons/turf/walls/rt_medieval/stone/craft.dmi and b/icons/turf/walls/rt_medieval/stone/craft.dmi differ diff --git a/icons/turf/walls/rt_medieval/stone/craft.png b/icons/turf/walls/rt_medieval/stone/craft.png new file mode 100644 index 00000000000..f91012d8817 Binary files /dev/null and b/icons/turf/walls/rt_medieval/stone/craft.png differ diff --git a/icons/turf/walls/rt_medieval/stone/craft.png.toml b/icons/turf/walls/rt_medieval/stone/craft.png.toml new file mode 100644 index 00000000000..77f5cc801bb --- /dev/null +++ b/icons/turf/walls/rt_medieval/stone/craft.png.toml @@ -0,0 +1,10 @@ +template = "impl/wall/rt_medieval.toml" + +smooth_diagonally = true + +[positions] +convex = 0 +vertical = 1 +horizontal = 2 +concave = 3 +flat = 4 diff --git a/icons/turf/walls/rt_medieval/stone/moss_blue.dmi b/icons/turf/walls/rt_medieval/stone/moss_blue.dmi index b43de19a657..0ebf5e4bcb7 100644 Binary files a/icons/turf/walls/rt_medieval/stone/moss_blue.dmi and b/icons/turf/walls/rt_medieval/stone/moss_blue.dmi differ diff --git a/icons/turf/walls/rt_medieval/stone/moss_blue.png b/icons/turf/walls/rt_medieval/stone/moss_blue.png new file mode 100644 index 00000000000..831631526f1 Binary files /dev/null and b/icons/turf/walls/rt_medieval/stone/moss_blue.png differ diff --git a/icons/turf/walls/rt_medieval/stone/moss_blue.png.toml b/icons/turf/walls/rt_medieval/stone/moss_blue.png.toml new file mode 100644 index 00000000000..77f5cc801bb --- /dev/null +++ b/icons/turf/walls/rt_medieval/stone/moss_blue.png.toml @@ -0,0 +1,10 @@ +template = "impl/wall/rt_medieval.toml" + +smooth_diagonally = true + +[positions] +convex = 0 +vertical = 1 +horizontal = 2 +concave = 3 +flat = 4 diff --git a/icons/turf/walls/rt_medieval/stone/moss_green.dmi b/icons/turf/walls/rt_medieval/stone/moss_green.dmi new file mode 100644 index 00000000000..88bdbd5a806 Binary files /dev/null and b/icons/turf/walls/rt_medieval/stone/moss_green.dmi differ diff --git a/icons/turf/walls/rt_medieval/stone/moss_green.png b/icons/turf/walls/rt_medieval/stone/moss_green.png new file mode 100644 index 00000000000..dcddc418729 Binary files /dev/null and b/icons/turf/walls/rt_medieval/stone/moss_green.png differ diff --git a/icons/turf/walls/rt_medieval/stone/moss_green.png.toml b/icons/turf/walls/rt_medieval/stone/moss_green.png.toml new file mode 100644 index 00000000000..77f5cc801bb --- /dev/null +++ b/icons/turf/walls/rt_medieval/stone/moss_green.png.toml @@ -0,0 +1,10 @@ +template = "impl/wall/rt_medieval.toml" + +smooth_diagonally = true + +[positions] +convex = 0 +vertical = 1 +horizontal = 2 +concave = 3 +flat = 4 diff --git a/icons/turf/walls/rt_medieval/stone/moss_red.dmi b/icons/turf/walls/rt_medieval/stone/moss_red.dmi index b2511e239c2..d6c7ec4912e 100644 Binary files a/icons/turf/walls/rt_medieval/stone/moss_red.dmi and b/icons/turf/walls/rt_medieval/stone/moss_red.dmi differ diff --git a/icons/turf/walls/rt_medieval/stone/moss_red.png b/icons/turf/walls/rt_medieval/stone/moss_red.png new file mode 100644 index 00000000000..83107ef6ede Binary files /dev/null and b/icons/turf/walls/rt_medieval/stone/moss_red.png differ diff --git a/icons/turf/walls/rt_medieval/stone/moss_red.png.toml b/icons/turf/walls/rt_medieval/stone/moss_red.png.toml new file mode 100644 index 00000000000..77f5cc801bb --- /dev/null +++ b/icons/turf/walls/rt_medieval/stone/moss_red.png.toml @@ -0,0 +1,10 @@ +template = "impl/wall/rt_medieval.toml" + +smooth_diagonally = true + +[positions] +convex = 0 +vertical = 1 +horizontal = 2 +concave = 3 +flat = 4 diff --git a/icons/turf/walls/rt_medieval/wood.dmi b/icons/turf/walls/rt_medieval/wood.dmi index 5e24266c147..6cc0d36158e 100644 Binary files a/icons/turf/walls/rt_medieval/wood.dmi and b/icons/turf/walls/rt_medieval/wood.dmi differ diff --git a/icons/turf/walls/rt_medieval/wood.png b/icons/turf/walls/rt_medieval/wood.png new file mode 100644 index 00000000000..43645e7f1a4 Binary files /dev/null and b/icons/turf/walls/rt_medieval/wood.png differ diff --git a/icons/turf/walls/rt_medieval/wood.png.toml b/icons/turf/walls/rt_medieval/wood.png.toml new file mode 100644 index 00000000000..77f5cc801bb --- /dev/null +++ b/icons/turf/walls/rt_medieval/wood.png.toml @@ -0,0 +1,10 @@ +template = "impl/wall/rt_medieval.toml" + +smooth_diagonally = true + +[positions] +convex = 0 +vertical = 1 +horizontal = 2 +concave = 3 +flat = 4 diff --git a/tools/build/build.js b/tools/build/build.js index ac34b5e889f..bc4e14e3f8c 100755 --- a/tools/build/build.js +++ b/tools/build/build.js @@ -141,7 +141,7 @@ export const IconCutterTarget = new Juke.Target({ const standard_inputs = [ `icons/**/*.png.toml`, `icons/**/*.dmi.toml`, - `cutter_templates/**/*.toml`, + `icon_cutter_templates/**/*.toml`, cutter_path, ]; // Alright we're gonna search out any existing toml files and convert @@ -169,7 +169,7 @@ export const IconCutterTarget = new Juke.Target({ await Juke.exec(cutter_path, [ "--dont-wait", "--templates", - "cutter_templates", + "icon_cutter_templates", "icons", ]); },