Merge pull request #9260 from dapnee/trim-decals

Ports trim decals
2019-09-11 03:26:47 -07:00
parent df8b4c86ae 9f275ebf01
commit f4bff19592
2 changed files with 200 additions and 1 deletions
@@ -36,4 +36,203 @@
 /obj/effect/turf_decal/tile/neutral
 	name = "neutral corner"
 	color = "#D4D4D4"
-	alpha = 50
+	alpha = 50
+
+/obj/effect/turf_decal/trimline
+	layer = TURF_PLATING_DECAL_LAYER
+	alpha = 110
+	icon_state = "trimline_box"
+
+/obj/effect/turf_decal/trimline/white
+	color = "#FFFFFF"
+
+/obj/effect/turf_decal/trimline/white/line
+	name = "trim decal"
+	icon_state = "trimline"
+
+/obj/effect/turf_decal/trimline/white/corner
+	icon_state = "trimline_corner"
+
+/obj/effect/turf_decal/trimline/white/end
+	icon_state = "trimline_end"
+
+/obj/effect/turf_decal/trimline/white/filled
+	icon_state = "trimline_box_fill"
+
+/obj/effect/turf_decal/trimline/white/filled/line
+	icon_state = "trimline_fill"
+
+/obj/effect/turf_decal/trimline/white/filled/corner
+	icon_state = "trimline_corner_fill"
+
+/obj/effect/turf_decal/trimline/white/filled/end
+	icon_state = "trimline_end_fill"
+
+/obj/effect/turf_decal/trimline/red
+	color = "#DE3A3A"
+
+/obj/effect/turf_decal/trimline/red/line
+	icon_state = "trimline"
+
+/obj/effect/turf_decal/trimline/red/corner
+	icon_state = "trimline_corner"
+
+/obj/effect/turf_decal/trimline/red/end
+	icon_state = "trimline_end"
+
+/obj/effect/turf_decal/trimline/red/filled
+	icon_state = "trimline_box_fill"
+
+/obj/effect/turf_decal/trimline/red/filled/line
+	icon_state = "trimline_fill"
+
+/obj/effect/turf_decal/trimline/red/filled/corner
+	icon_state = "trimline_corner_fill"
+
+/obj/effect/turf_decal/trimline/red/filled/end
+	icon_state = "trimline_end_fill"
+
+/obj/effect/turf_decal/trimline/green
+	color = "#9FED58"
+
+/obj/effect/turf_decal/trimline/green/line
+	icon_state = "trimline"
+
+/obj/effect/turf_decal/trimline/green/corner
+	icon_state = "trimline_corner"
+
+/obj/effect/turf_decal/trimline/green/end
+	icon_state = "trimline_end"
+
+/obj/effect/turf_decal/trimline/green/filled
+	icon_state = "trimline_box_fill"
+
+/obj/effect/turf_decal/trimline/green/filled/line
+	icon_state = "trimline_fill"
+
+/obj/effect/turf_decal/trimline/green/filled/corner
+	icon_state = "trimline_corner_fill"
+
+/obj/effect/turf_decal/trimline/green/filled/end
+	icon_state = "trimline_end_fill"
+
+/obj/effect/turf_decal/trimline/blue
+	color = "#52B4E9"
+
+/obj/effect/turf_decal/trimline/blue/line
+	icon_state = "trimline"
+
+/obj/effect/turf_decal/trimline/blue/corner
+	icon_state = "trimline_corner"
+
+/obj/effect/turf_decal/trimline/blue/end
+	icon_state = "trimline_end"
+
+/obj/effect/turf_decal/trimline/blue/filled
+	icon_state = "trimline_box_fill"
+
+/obj/effect/turf_decal/trimline/blue/filled/line
+	icon_state = "trimline_fill"
+
+/obj/effect/turf_decal/trimline/blue/filled/corner
+	icon_state = "trimline_corner_fill"
+
+/obj/effect/turf_decal/trimline/blue/filled/end
+	icon_state = "trimline_end_fill"
+
+/obj/effect/turf_decal/trimline/yellow
+	color = "#EFB341"
+
+/obj/effect/turf_decal/trimline/yellow/line
+	icon_state = "trimline"
+
+/obj/effect/turf_decal/trimline/yellow/corner
+	icon_state = "trimline_corner"
+
+/obj/effect/turf_decal/trimline/yellow/end
+	icon_state = "trimline_end"
+
+/obj/effect/turf_decal/trimline/yellow/filled
+	icon_state = "trimline_box_fill"
+
+/obj/effect/turf_decal/trimline/yellow/filled/line
+	icon_state = "trimline_fill"
+
+/obj/effect/turf_decal/trimline/yellow/filled/corner
+	icon_state = "trimline_corner_fill"
+
+/obj/effect/turf_decal/trimline/yellow/filled/end
+	icon_state = "trimline_end_fill"
+
+/obj/effect/turf_decal/trimline/purple
+	color = "#D381C9"
+
+/obj/effect/turf_decal/trimline/purple/line
+	icon_state = "trimline"
+
+/obj/effect/turf_decal/trimline/purple/corner
+	icon_state = "trimline_corner"
+
+/obj/effect/turf_decal/trimline/purple/end
+	icon_state = "trimline_end"
+
+/obj/effect/turf_decal/trimline/purple/filled
+	icon_state = "trimline_box_fill"
+
+/obj/effect/turf_decal/trimline/purple/filled/line
+	icon_state = "trimline_fill"
+
+/obj/effect/turf_decal/trimline/purple/filled/corner
+	icon_state = "trimline_corner_fill"
+
+/obj/effect/turf_decal/trimline/purple/filled/end
+	icon_state = "trimline_end_fill"
+
+/obj/effect/turf_decal/trimline/brown
+	color = "#A46106"
+
+/obj/effect/turf_decal/trimline/brown/line
+	icon_state = "trimline"
+
+/obj/effect/turf_decal/trimline/brown/corner
+	icon_state = "trimline_corner"
+
+/obj/effect/turf_decal/trimline/brown/end
+	icon_state = "trimline_end"
+
+/obj/effect/turf_decal/trimline/brown/filled
+	icon_state = "trimline_box_fill"
+
+/obj/effect/turf_decal/trimline/brown/filled/line
+	icon_state = "trimline_fill"
+
+/obj/effect/turf_decal/trimline/brown/filled/corner
+	icon_state = "trimline_corner_fill"
+
+/obj/effect/turf_decal/trimline/brown/filled/end
+	icon_state = "trimline_end_fill"
+
+/obj/effect/turf_decal/trimline/neutral
+	color = "#D4D4D4"
+	alpha = 50
+
+/obj/effect/turf_decal/trimline/neutral/line
+	icon_state = "trimline"
+
+/obj/effect/turf_decal/trimline/neutral/corner
+	icon_state = "trimline_corner"
+
+/obj/effect/turf_decal/trimline/neutral/end
+	icon_state = "trimline_end"
+
+/obj/effect/turf_decal/trimline/neutral/filled
+	icon_state = "trimline_box_fill"
+
+/obj/effect/turf_decal/trimline/neutral/filled/line
+	icon_state = "trimline_fill"
+
+/obj/effect/turf_decal/trimline/neutral/filled/corner
+	icon_state = "trimline_corner_fill"
+
+/obj/effect/turf_decal/trimline/brown/filled/end
+	icon_state = "trimline_end_fill"