[IDB IGNORE] Daedalus Wallening Real?

code/__DEFINES/paint.dm

@@ -9,12 +9,12 @@
 #define PAINT_STRIPE_PRIAPUS PAINT_STRIPE_DAEDALUS
 
 //Mars Executive Outcomes
-#define PAINT_WALL_MARS PAINT_WALL_DAEDALUS
-#define PAINT_STRIPE_MARSEXECUTIVE "#683822"
+#define PAINT_WALL_MARS "#caae81"
+#define PAINT_STRIPE_MARS "#6b2525"
 
 //Medical
 #define PAINT_WALL_MEDICAL "#FFFFFF"
-#define PAINT_STRIPE_MEDICAL "#FFFFFF"
+#define PAINT_STRIPE_MEDICAL "#2da17e"
 
 //Command
 #define PAINT_WALL_COMMAND "#182d42"

code/datums/materials/_material.dm

@@ -48,11 +48,15 @@ Simple datum which is instanced once per type and is used for every object of sa
 	var/obj/item/shard_type
 
 	///Icon for walls which are plated with this material
-	var/wall_icon = 'icons/turf/walls/solid_wall.dmi'
+	var/wall_icon = 'icons/turf/walls/bimmer_walls.dmi'
 	///Icon for reinforced walls which are plated with this material
 	var/reinforced_wall_icon = 'icons/turf/walls/metal_wall.dmi'
 	/// Icon for painted stripes on the walls
-	var/wall_stripe_icon = 'icons/turf/walls/wall_stripe.dmi'
+	var/wall_stripe_icon = 'icons/turf/walls/bimmer_stripes.dmi'
+	/// Icon for painted stripes on reinforced walls
+	var/reinforced_wall_stripe_icon = 'icons/turf/walls/bimmer_stripes_low.dmi'
+	/// Icon for painted stripes on the low walls
+	var/low_wall_stripe_icon = 'icons/turf/walls/bimmer_stripes_low.dmi'
 	/// Color of walls constructed with this material as their plating
 	var/wall_color
 	/// Type of the wall this material makes when its used as a plating, null means can't make a wall out of it.

code/datums/materials/basemats.dm

@@ -279,7 +279,8 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	texture_layer_icon_state = "woodgrain"
 	wall_icon = 'icons/turf/walls/wood_wall.dmi'
 	wall_stripe_icon = 'icons/turf/walls/wood_wall_stripe.dmi'
-	wall_color = "#93662C"
+	low_wall_stripe_icon = 'icons/turf/walls/wood_wall_stripe.dmi'
+	wall_color = "#38260f"
 	wall_type = /turf/closed/wall/mineral/wood
 	false_wall_type = /obj/structure/falsewall/wood
 

code/game/objects/effects/spawners/structure.dm

@@ -412,12 +412,12 @@ again.
 
 /obj/effect/spawner/structure/window/prepainted/marsexec
 	name = "reinforced window spawner (mars executive paint)"
-	spawn_list = list(/obj/structure/low_wall/prepainted/daedalus, /obj/structure/window/fulltile)
+	spawn_list = list(/obj/structure/low_wall/prepainted/marsexec, /obj/structure/window/fulltile)
 
 /obj/effect/spawner/structure/window/reinforced/prepainted/marsexec
 	name = "window spawner (mars executive paint)"
-	spawn_list = list(/obj/structure/low_wall/prepainted/daedalus, /obj/structure/window/reinforced/fulltile)
+	spawn_list = list(/obj/structure/low_wall/prepainted/marsexec, /obj/structure/window/reinforced/fulltile)
 
 /obj/effect/spawner/structure/window/reinforced/tinted/prepainted/marsexec
 	name = "tinted reinforced window spawner (mars executive paint)"
-	spawn_list = list(/obj/structure/low_wall/prepainted/daedalus, /obj/structure/window/reinforced/tinted/fulltile)
+	spawn_list = list(/obj/structure/low_wall/prepainted/marsexec, /obj/structure/window/reinforced/tinted/fulltile)

code/game/objects/items/paint.dm

@@ -21,7 +21,7 @@
 	var/preset_wall_colors= list(
 		"Daedalus Industries" = list("wall" = PAINT_WALL_DAEDALUS, "trim" = PAINT_STRIPE_DAEDALUS),
 		"Priapus Recreational Solutions" = list("wall" = PAINT_WALL_PRIAPUS, "trim" = PAINT_STRIPE_PRIAPUS),
-		"Mars People's Coalition" = list("wall" = PAINT_WALL_MARS, "trim" = PAINT_STRIPE_MARSEXECUTIVE),
+		"Mars People's Coalition" = list("wall" = PAINT_WALL_MARS, "trim" = PAINT_STRIPE_MARS),
 		"Command" = list("wall" = PAINT_WALL_COMMAND, "trim" = PAINT_STRIPE_COMMAND),
 		"Medical" = list("wall" = PAINT_WALL_MEDICAL, "trim" = PAINT_STRIPE_MEDICAL),
 	)

code/game/objects/structures/false_walls.dm

@@ -211,7 +211,10 @@
 		icon = plating_mat_ref.wall_icon
 		material_color = plating_mat_ref.wall_color
 
-	stripe_icon = plating_mat_ref.wall_stripe_icon
+	if(reinf_mat_ref)
+		stripe_icon = plating_mat_ref.reinforced_wall_stripe_icon
+	else
+		stripe_icon = plating_mat_ref.wall_stripe_icon
 
 	plating_material = plating_mat
 	reinf_material = reinf_mat

code/game/objects/structures/low_wall.dm

@@ -191,7 +191,7 @@
 	var/datum/material/mat_ref = GET_MATERIAL_REF(plating_material)
 
 	material_color = mat_ref.wall_color
-	stripe_icon = mat_ref.wall_stripe_icon
+	stripe_icon = mat_ref.low_wall_stripe_icon
 
 	if(update_appearance)
 		update_appearance()
@@ -225,4 +225,4 @@
 
 /obj/structure/low_wall/prepainted/marsexec
 	wall_paint = PAINT_WALL_MARS
-	stripe_paint = PAINT_WALL_MARS
+	stripe_paint = PAINT_STRIPE_MARS

code/game/turfs/closed/wall/mineral_walls.dm

@@ -87,7 +87,7 @@
 	name = "plasma wall"
 	desc = "A wall with plasma plating. This is definitely a bad idea."
 	plating_material = /datum/material/plasma
-	color = "#c162ec" //To display in mapping softwares
+	color = /datum/material/plasma::wall_color //To display in mapping softwares
 
 /turf/closed/wall/mineral/wood
 	name = "wooden wall"
@@ -97,7 +97,7 @@
 	turf_flags = IS_SOLID
 	explosion_block = 0
 	plating_material = /datum/material/wood
-	color = "#bb8e53" //To display in mapping softwares
+	color = /datum/material/wood::wall_color //To display in mapping softwares
 
 /turf/closed/wall/mineral/wood/attackby(obj/item/W, mob/user)
 	if((W.sharpness & SHARP_EDGED) && W.force)

code/game/turfs/closed/wall/prepainted_walls.dm

@@ -59,3 +59,13 @@
 	color = PAINT_WALL_COMMAND
 	wall_paint = PAINT_WALL_COMMAND
 	stripe_paint = PAINT_STRIPE_COMMAND
+
+/turf/closed/wall/prepainted/mars
+	color = PAINT_WALL_MARS
+	wall_paint = PAINT_WALL_MARS
+	stripe_paint = PAINT_STRIPE_MARS
+
+/turf/closed/wall/r_wall/prepainted/mars
+	color = PAINT_WALL_MARS
+	wall_paint = PAINT_WALL_MARS
+	stripe_paint = PAINT_STRIPE_MARS

code/game/turfs/closed/walls.dm

@@ -16,7 +16,7 @@ GLOBAL_REAL_VAR(wall_overlays_cache) = list()
 /turf/closed/wall
 	name = "wall"
 	desc = "A huge chunk of iron used to separate rooms."
-	icon = 'icons/turf/walls/solid_wall.dmi'
+	icon = 'icons/turf/walls/bimmer_walls.dmi'
 	icon_state = "wall-0"
 	base_icon_state = "wall"
 
@@ -35,7 +35,7 @@ GLOBAL_REAL_VAR(wall_overlays_cache) = list()
 
 	rcd_memory = RCD_MEMORY_WALL
 
-	color = "#57575c" //To display in mapping softwares
+	color = /datum/material/iron::wall_color //To display in mapping softwares
 
 	///lower numbers are harder. Used to determine the probability of a hulk smashing through.
 	var/hardness = 40
@@ -237,7 +237,10 @@ GLOBAL_REAL_VAR(wall_overlays_cache) = list()
 		material_color = plating_mat_ref.wall_color
 		explosion_block = initial(explosion_block)
 
-	stripe_icon = plating_mat_ref.wall_stripe_icon
+	if(reinf_mat_ref)
+		stripe_icon = plating_mat_ref.reinforced_wall_stripe_icon
+	else
+		stripe_icon = plating_mat_ref.wall_stripe_icon
 
 	plating_material = plating_mat
 	reinf_material = reinf_mat