progress

DaedalusDock · Aug 31, 2024 · 99ab2ee · 99ab2ee
1 parent 9d3adba
commit 99ab2ee
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 9 deletions.
diff --git a/_bimmers_sprites/bimmer_stripes.dmi → _bimmers_sprites/_bimmer_stripes_ODNE.dmi b/_bimmers_sprites/bimmer_stripes.dmi → _bimmers_sprites/_bimmer_stripes_ODNE.dmi
diff --git a/_bimmers_sprites/bimmer_stripes_low.dmi → ...mers_sprites/_bimmer_stripes_low_ODNE.dmi b/_bimmers_sprites/bimmer_stripes_low.dmi → ...mers_sprites/_bimmer_stripes_low_ODNE.dmi
diff --git a/_bimmers_sprites/bimmer_walls.dmi → _bimmers_sprites/_bimmer_walls_ODNE.dmi b/_bimmers_sprites/bimmer_walls.dmi → _bimmers_sprites/_bimmer_walls_ODNE.dmi
diff --git a/_bimmers_sprites/stripe_fixed.png → _bimmers_sprites/_stripe_ODNI.png b/_bimmers_sprites/stripe_fixed.png → _bimmers_sprites/_stripe_ODNI.png
diff --git a/_bimmers_sprites/tiles16x.dmi → _bimmers_sprites/_tiles16x_ODNI.dmi b/_bimmers_sprites/tiles16x.dmi → _bimmers_sprites/_tiles16x_ODNI.dmi
diff --git a/_bimmers_sprites/tiles32x.dmi → _bimmers_sprites/_tiles32x_ODNI.dmi b/_bimmers_sprites/tiles32x.dmi → _bimmers_sprites/_tiles32x_ODNI.dmi
diff --git a/_bimmers_sprites/wall.png → _bimmers_sprites/_wall_ODNI.png b/_bimmers_sprites/wall.png → _bimmers_sprites/_wall_ODNI.png
diff --git a/_bimmers_sprites/reduced_grime_wall.png b/_bimmers_sprites/reduced_grime_wall.png
diff --git a/_bimmers_sprites/stripe.png b/_bimmers_sprites/stripe.png
diff --git a/code/__DEFINES/paint.dm b/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 "#e6b669"
+#define PAINT_STRIPE_MARS "#e24835"
 
 //Medical
 #define PAINT_WALL_MEDICAL "#FFFFFF"
-#define PAINT_STRIPE_MEDICAL "#FFFFFF"
+#define PAINT_STRIPE_MEDICAL "#2da17e"
 
 //Command
 #define PAINT_WALL_COMMAND "#182d42"

diff --git a/code/game/objects/effects/spawners/structure.dm b/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)
diff --git a/code/game/objects/items/paint.dm b/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),
 	)

diff --git a/code/game/objects/structures/low_wall.dm b/code/game/objects/structures/low_wall.dm
@@ -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
diff --git a/code/game/turfs/closed/wall/prepainted_walls.dm b/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
diff --git a/code/game/turfs/closed/walls.dm b/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"
 

diff --git a/icons/turf/walls/bimmer_walls.dmi b/icons/turf/walls/bimmer_walls.dmi