Tweaks Casino Ship and Bearcat (#561)

vlggms · Feb 29, 2024 · 12a5b43 · 12a5b43
1 parent d883ffc
commit 12a5b43
Show file tree

Hide file tree

Showing 10 changed files with 1,173 additions and 503 deletions.
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
@@ -1473,16 +1473,61 @@ About the new airlock wires panel:
 
 /obj/machinery/door/airlock/autoname
 
-/obj/machinery/door/airlock/autoname/New()
+/obj/machinery/door/airlock/autoname/Initialize()
+	. = ..()
 	var/area/A = get_area(src)
 	name = A.name
-	..()
 
-/obj/machinery/door/airlock/proc/paint_airlock(var/paint_color)
+/obj/machinery/door/airlock/autoname/command
+	door_color = COLOR_COMMAND_BLUE
+
+/obj/machinery/door/airlock/autoname/security
+	door_color = COLOR_NT_RED
+
+/obj/machinery/door/airlock/autoname/security/research
+	door_color = COLOR_WHITE
+	stripe_color = COLOR_NT_RED
+
+/obj/machinery/door/airlock/autoname/engineering
+	name = "Maintenance Hatch"
+	door_color = COLOR_AMBER
+
+/obj/machinery/door/airlock/autoname/medical
+	door_color = COLOR_WHITE
+	stripe_color = COLOR_DEEP_SKY_BLUE
+
+/obj/machinery/door/airlock/autoname/virology
+	door_color = COLOR_WHITE
+	stripe_color = COLOR_GREEN
+
+/obj/machinery/door/airlock/autoname/mining
+	name = "Mining Airlock"
+	door_color = COLOR_PALE_ORANGE
+	stripe_color = COLOR_BEASTY_BROWN
+
+/obj/machinery/door/airlock/autoname/atmos
+	door_color = COLOR_AMBER
+	stripe_color = COLOR_CYAN
+
+/obj/machinery/door/airlock/autoname/research
+	door_color = COLOR_WHITE
+	stripe_color = COLOR_BOTTLE_GREEN
+
+/obj/machinery/door/airlock/autoname/science
+	door_color = COLOR_WHITE
+	stripe_color = COLOR_VIOLET
+
+/obj/machinery/door/airlock/autoname/sol
+	door_color = COLOR_BLUE_GRAY
+
+/obj/machinery/door/airlock/autoname/civilian
+	stripe_color = COLOR_CIVIE_GREEN
+
+/obj/machinery/door/airlock/proc/paint_airlock(paint_color)
 	door_color = paint_color
 	update_icon()
 
-/obj/machinery/door/airlock/proc/stripe_airlock(var/paint_color)
+/obj/machinery/door/airlock/proc/stripe_airlock(paint_color)
 	stripe_color = paint_color
 	update_icon()
 

diff --git a/maps/away/bearcat/bearcat-1.dmm b/maps/away/bearcat/bearcat-1.dmm
@@ -338,7 +338,7 @@
 /turf/simulated/wall/r_wall,
 /area/ship/scrap/gambling)
 "aM" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
@@ -396,7 +396,7 @@
 /turf/simulated/floor/tiled,
 /area/ship/scrap/cargo/lower)
 "aS" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
@@ -604,7 +604,7 @@
 /turf/simulated/floor,
 /area/ship/scrap/gambling)
 "bm" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -638,7 +638,7 @@
 /turf/simulated/floor,
 /area/ship/scrap/maintenance/lower)
 "bo" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
 /turf/simulated/floor,
 /area/ship/scrap/cargo/lower)
 "bp" = (
@@ -731,7 +731,7 @@
 /turf/simulated/floor,
 /area/ship/scrap/maintenance/lower)
 "bw" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
 /obj/structure/cable/green{
 	d1 = 4;
 	d2 = 8;
@@ -1185,7 +1185,7 @@
 /turf/simulated/floor,
 /area/ship/scrap/broken2)
 "cq" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -1267,7 +1267,7 @@
 /turf/simulated/floor,
 /area/ship/scrap/maintenance/lower)
 "cy" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -1401,7 +1401,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
 /turf/simulated/floor,
 /area/ship/scrap/maintenance/lower)
 "cP" = (
@@ -1676,7 +1676,7 @@
 /turf/simulated/floor,
 /area/ship/scrap/broken1)
 "dn" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -1724,7 +1724,7 @@
 /turf/simulated/floor/tiled,
 /area/ship/scrap/cargo/lower)
 "ds" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -1816,7 +1816,7 @@
 /turf/simulated/floor/tiled,
 /area/ship/scrap/broken1)
 "dA" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
 /turf/simulated/floor/tiled,
 /area/ship/scrap/cargo/lower)
 "dB" = (
@@ -1827,7 +1827,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
 /turf/simulated/floor,
 /area/ship/scrap/cargo/lower)
 "dC" = (
@@ -1916,7 +1916,7 @@
 /turf/simulated/floor,
 /area/ship/scrap/maintenance/lower)
 "dL" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -2036,7 +2036,7 @@
 /turf/simulated/floor,
 /area/ship/scrap/maintenance/lower)
 "dS" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -2085,7 +2085,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
 /turf/simulated/floor,
 /area/ship/scrap/maintenance/storage)
 "dY" = (
@@ -2284,7 +2284,7 @@
 /turf/simulated/floor,
 /area/ship/scrap/maintenance/techstorage)
 "eq" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -2386,7 +2386,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -2817,7 +2817,7 @@
 /turf/simulated/floor/reinforced/airless,
 /area/ship/scrap/crew/dorms3)
 "EP" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},