Skip to content

Commit 011e27a

Browse files
authored
rt_medieval wall smoothing (#7251)
1 parent b5871ca commit 011e27a

35 files changed

+127
-15
lines changed

code/game/turfs/simulated/wall/subtypes/rt_medieval.dm

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
abstract_type = /turf/simulated/wall/rt_medieval
1313
integrity_flags = INTEGRITY_INDESTRUCTIBLE
1414
material_system = FALSE
15+
base_icon_state = "wall"
16+
icon_state = "wall-0"
17+
// needed due to base wall being steel :/
18+
color = null
1519

1620
// TODO: destructible sprites, consturction, shift these slowly into
1721
// materials system. wall themes/styles?
@@ -21,46 +25,38 @@
2125
name = "archaic terrain wall"
2226
desc = "You don't how this was made, but it doesn't look very welcoming."
2327
icon = 'icons/turf/walls/rt_medieval/boss.dmi'
24-
icon_state = "boss"
25-
26-
/turf/simulated/wall/rt_medieval/brick
27-
name = "archaic brick wall"
28-
desc = "An archaic wall made from brick. It looks sturdy."
29-
icon = 'icons/turf/walls/rt_medieval/brick.dmi'
30-
icon_state = "brick"
3128

3229
/turf/simulated/wall/rt_medieval/stone
3330
name = "archaic stone wall"
3431
desc = "An archaic wall made from stone. It looks sturdy."
3532
icon = 'icons/turf/walls/rt_medieval/stone.dmi'
36-
icon_state = "stone"
3733

3834
/turf/simulated/wall/rt_medieval/stone/brick
3935
name = "archaic stone brick wall"
4036
desc = "An archaic wall made from stone brick. It looks sturdy."
4137
icon = 'icons/turf/walls/rt_medieval/stone/brick.dmi'
42-
icon_state = "stone_brick"
4338

4439
/turf/simulated/wall/rt_medieval/stone/craft
4540
name = "archaic craft stone wall"
4641
desc = "An archaic wall made from textured stone. It looks sturdy."
4742
icon = 'icons/turf/walls/rt_medieval/stone/craft.dmi'
48-
icon_state = "stone_craft"
4943

5044
/turf/simulated/wall/rt_medieval/stone/moss_red
5145
name = "archaic mossy stone wall"
5246
desc = "An archaic wall made from stone. It looks sturdy."
5347
icon = 'icons/turf/walls/rt_medieval/stone/moss_red.dmi'
54-
icon_state = "stone_moss_red"
48+
49+
/turf/simulated/wall/rt_medieval/stone/moss_green
50+
name = "archaic mossy stone wall"
51+
desc = "An archaic wall made from stone. It looks sturdy."
52+
icon = 'icons/turf/walls/rt_medieval/stone/moss_green.dmi'
5553

5654
/turf/simulated/wall/rt_medieval/stone/moss_blue
5755
name = "archaic mossy stone wall"
5856
desc = "An archaic wall made from stone. It looks sturdy."
5957
icon = 'icons/turf/walls/rt_medieval/stone/moss_blue.dmi'
60-
icon_state = "stone_moss_blue"
6158

6259
/turf/simulated/wall/rt_medieval/wood
6360
name = "archaic wooden wall"
6461
desc = "An archaic wall made from wood. It looks sturdy."
6562
icon = 'icons/turf/walls/rt_medieval/wood.dmi'
66-
icon_state = "wood"

code/game/turfs/simulated/wall/wall.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Surely, *surely*, such a nice, amazing thing wouldn't be entirely shitcode.
44
* Right?
55
*
6+
* TODO: /turf/simulated/wall/material; do not have steel defines on base.
7+
*
68
* ## Material System
79
*
810
* By default, walls are made out of /datum/material's.

icon_cutter_templates/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Icon cutter templates
2+
3+
Templates for the automated icon cutter.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Implementation Templates
2+
3+
Organized templates for Citadel RP's features.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
template = "impl/wall_default.toml"
2+
3+
output_name = "wall"
4+
smooth_diagonally = false
5+
6+
[positions]
7+
convex = 0
8+
horizontal = 1
9+
vertical = 2
10+
concave = 3
11+
12+
[cut_pos]
13+
x = 16
14+
y = 16
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
mode = "BitmaskSlice"
2+
produce_dirs = false
3+
4+
[icon_size]
5+
x = 32
6+
y = 32
7+
8+
[output_icon_pos]
9+
x = 0
10+
y = 0
11+
12+
[output_icon_size]
13+
x = 32
14+
y = 32
9.32 KB
Binary file not shown.

0 commit comments

Comments
 (0)