Woodrat 9.1 "Back in Action"

- Super APC installed in Atmos
- Fixed APC, Mining Exterior APC
- Fixed Crematorium button, Installed mass driver button.
- Chapel hallway APC installed
- Gateway plugged in, console installed
- Elevator Console Installed, Bell Hop removed.
- Hazard stripes should be fixed
- Restored missing tiles (Hydro, Cafeteria Neutral, Asteroid exterior) (75% complete)
- Kitchen button restored
- Rec area bathroom lights restored
- Meat is back on the menu, two fridges with meat in the kitchen
- Unneeded wires in engineering maint removed.
- Medical substation wires fixed.
- Locker room maint APC installed
- Chapel maint APC installed
- Installed another light in robotics
- APC central maint installed
- Disposals pipe in engineering workshop fixed.
- Wire in atmos substation fixed.

code/ATMOSPHERICS/_atmos_setup.dm

@@ -13,13 +13,14 @@
 #define	PIPE_COLOR_GREEN	"#00ff00"
 #define	PIPE_COLOR_YELLOW	"#ffcc00"
 #define	PIPE_COLOR_BLACK	"#444444"
+#define	PIPE_COLOR_PURPLE	"#5c1ec0"
 
 #define CONNECT_TYPE_REGULAR	1
 #define CONNECT_TYPE_SUPPLY		2
 #define CONNECT_TYPE_SCRUBBER	4
 #define CONNECT_TYPE_HE			8
 
-var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "black" = PIPE_COLOR_BLACK)
+var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "black" = PIPE_COLOR_BLACK, "purple" = PIPE_COLOR_PURPLE)
 
 /proc/pipe_color_lookup(var/color)
 	for(var/C in pipe_colors)

code/ATMOSPHERICS/pipes.dm

@@ -357,6 +357,8 @@
 /obj/machinery/atmospherics/pipe/simple/visible/blue
 	color = PIPE_COLOR_BLUE
 
+/obj/machinery/atmospherics/pipe/simple/visible/purple
+	color = PIPE_COLOR_PURPLE
 
 /obj/machinery/atmospherics/pipe/simple/hidden
 	icon_state = "intact"
@@ -399,6 +401,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/blue
 	color = PIPE_COLOR_BLUE
 
+/obj/machinery/atmospherics/pipe/simple/hidden/purple
+	color = PIPE_COLOR_PURPLE
+
 /obj/machinery/atmospherics/pipe/simple/insulated
 	icon = 'icons/obj/atmospherics/red_pipe.dmi'
 	icon_state = "intact"
@@ -625,6 +630,8 @@
 /obj/machinery/atmospherics/pipe/manifold/visible/blue
 	color = PIPE_COLOR_BLUE
 
+/obj/machinery/atmospherics/pipe/manifold/visible/purple
+	color = PIPE_COLOR_PURPLE
 
 /obj/machinery/atmospherics/pipe/manifold/hidden
 	icon_state = "map"
@@ -667,6 +674,9 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/blue
 	color = PIPE_COLOR_BLUE
 
+/obj/machinery/atmospherics/pipe/manifold/hidden/purple
+	color = PIPE_COLOR_PURPLE
+
 /obj/machinery/atmospherics/pipe/manifold4w
 	icon = 'icons/atmos/manifold.dmi'
 	icon_state = ""
@@ -883,6 +893,9 @@
 /obj/machinery/atmospherics/pipe/manifold4w/visible/blue
 	color = PIPE_COLOR_BLUE
 
+/obj/machinery/atmospherics/pipe/manifold4w/visible/purple
+	color = PIPE_COLOR_PURPLE
+
 /obj/machinery/atmospherics/pipe/manifold4w/hidden
 	icon_state = "map_4way"
 	level = 1
@@ -924,6 +937,9 @@
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/blue
 	color = PIPE_COLOR_BLUE
 
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/purple
+	color = PIPE_COLOR_PURPLE
+
 /obj/machinery/atmospherics/pipe/cap
 	name = "pipe endcap"
 	desc = "An endcap for pipes"

code/game/area/Space Station 13 areas.dm

@@ -290,6 +290,7 @@ area/space/atmosalert()
 /area/shuttle/mining
 	name = "\improper Mining Shuttle"
 	music = "music/escape.ogg"
+	lighting_use_dynamic = 0
 
 /area/shuttle/mining/station
 	icon_state = "shuttle2"
@@ -379,6 +380,7 @@ area/space/atmosalert()
 /area/shuttle/research
 	name = "\improper Research Shuttle"
 	music = "music/escape.ogg"
+	lighting_use_dynamic = 0
 
 /area/shuttle/research/station
 	icon_state = "shuttle2"

code/game/area/asteroid_areas.dm

@@ -70,19 +70,19 @@
 	name = "Mining Outpost Maintenance"
 
 /area/outpost/mining_main/north_hall
-	name = "Mining Outpost North Hallway"
+	name = "Mining Outpost Fore Hallway"
 
 /area/outpost/mining_main/south_hall
-	name = "Mining Outpost South Hallway"
+	name = "Mining Outpost Aft Hallway"
 
 /area/outpost/mining_main/west_hall
-	name = "Mining Outpost West Hallway"
+	name = "Mining Outpost Port Hallway"
 
 /area/outpost/mining_main/east_hall
-	name = "Mining Outpost East Hallway"
+	name = "Mining Outpost Starboard Hallway"
 
 /area/outpost/mining_main/break_room
-	name = "Mining Outpost Break Room"
+	name = "Mining Outpost Crew Area"
 
 /area/outpost/mining_main/refinery
 	name = "Mining Outpost Refinery"
@@ -172,6 +172,18 @@
 /area/outpost/research/hallway
 	name = "Research Outpost Hallway"
 
+/area/outpost/research/hallway/mid
+	name = "Research Outpost Hallway Mid"
+
+/area/outpost/research/hallway/starboard
+	name = "Research Outpost Hallway Starboard"
+
+/area/outpost/research/hallway/catwalk
+	name = "Research Outpost Catwalk"
+
+/area/outpost/research/hallway/toxins_hallway
+	name = "Research Outpost Toxins Hallway"
+
 /area/outpost/research/dock
 	name = "Research Outpost Shuttle Dock"
 
@@ -181,6 +193,9 @@
 /area/outpost/research/analysis
 	name = "Research Outpost Sample Analysis"
 
+/area/outpost/research/anomaly
+	name = "Anomalous Materials Lab"
+
 /area/outpost/research/chemistry
 	name = "Research Outpost Chemistry"
 
@@ -191,13 +206,13 @@
 	name = "Research Outpost Maintenance"
 
 /area/outpost/research/isolation_a
-	name = "Research Outpost Isolation A"
+	name = "Research Outpost Isolation 1"
 
 /area/outpost/research/isolation_b
-	name = "Research Outpost Isolation B"
+	name = "Research Outpost Isolation 2"
 
 /area/outpost/research/isolation_c
-	name = "Research Outpost Isolation C"
+	name = "Research Outpost Isolation 3"
 
 /area/outpost/research/isolation_hall
 	name = "Research Outpost Isolation Hall"
@@ -206,7 +221,10 @@
 	name = "Research Outpost Bathroom"
 
 /area/outpost/research/dorms
-	name = "Research Outpost Dorms"
+	name = "Research Outpost Research Lounge"
+
+/area/outpost/research/longtermstorage
+	name = "Research Outpost Long-Term Storage"
 
 /area/outpost/research/anomaly_storage
 	name = "Research Outpost Anomalous Storage"
@@ -220,5 +238,27 @@
 /area/outpost/research/disposal
 	name = "Research Outpost Waste Disposal"
 
+/area/outpost/research/toxins_launch
+	name = "Research Outpost Toxins Launch Room"
+
 /area/outpost/research/tox_store
 	name = "Research Outpost Toxins Storage"
+
+/area/outpost/research/test_area
+	name = "\improper Research Outpost Toxins Test Area"
+	icon_state = "toxtest"
+
+/area/outpost/research/toxins_misc_lab
+	name = "\improper Research Outpost Toxins Miscellaneous Research"
+	icon_state = "toxmisc"
+
+/area/outpost/research/mixing
+	name = "\improper Research Outpost Toxins Mixing Room"
+	icon_state = "toxmix"
+
+/area/outpost/research/tempstorage
+	name = "Research Outpost Temporary Storage"
+
+/area/outpost/research/xenobiology
+	name = "\improper Research Outpost Xenobiology Lab"
+	icon_state = "xeno_lab"

code/game/turfs/flooring/flooring.dm

@@ -98,7 +98,14 @@ var/list/flooring_types
 
 /decl/flooring/tiling/steel
 	name = "floor"
-	icon_base = "steel"
+	icon_base = "steel_dirty"
+	has_damage_range = null
+	flags = TURF_REMOVE_CROWBAR
+	build_type = /obj/item/stack/tile/floor_steel
+
+/decl/flooring/tiling/asteroidfloor
+	name = "floor"
+	icon_base = "asteroidfloor"
 	has_damage_range = null
 	flags = TURF_REMOVE_CROWBAR
 	build_type = /obj/item/stack/tile/floor_steel
@@ -126,6 +133,20 @@ var/list/flooring_types
 	flags = TURF_REMOVE_CROWBAR
 	build_type = /obj/item/stack/tile/floor_dark
 
+/decl/flooring/tiling/hydro
+	name = "floor"
+	icon_base = "hydrofloor"
+	has_damage_range = null
+	flags = TURF_REMOVE_CROWBAR
+	build_type = /obj/item/stack/tile/floor_steel
+
+/decl/flooring/tiling/neutral
+	name = "floor"
+	icon_base = "neutral"
+	has_damage_range = null
+	flags = TURF_REMOVE_CROWBAR
+	build_type = /obj/item/stack/tile/floor_steel
+
 /decl/flooring/tiling/freezer
 	name = "floor"
 	desc = "Don't slip."

code/game/turfs/flooring/flooring_premade.dm

@@ -98,12 +98,12 @@
 /turf/simulated/floor/tiled/hydro
 	name = "hydro floor"
 	icon_state = "hydrofloor"
-	initial_flooring = /decl/flooring/tiling/steel
+	initial_flooring = /decl/flooring/tiling/hydro
 
 /turf/simulated/floor/tiled/neutral
 	name = "light floor"
 	icon_state = "neutral"
-	initial_flooring = /decl/flooring/tiling/steel
+	initial_flooring = /decl/flooring/tiling/neutral
 
 /turf/simulated/floor/tiled/red
 	name = "red floor"
@@ -116,11 +116,19 @@
 	icon_state = "steel_dirty"
 	initial_flooring = /decl/flooring/tiling/steel
 
-
 /turf/simulated/floor/tiled/steel/airless
 	oxygen = 0
 	nitrogen = 0
 
+/turf/simulated/floor/tiled/asteroid_steel
+	icon_state = "asteroidfloor"
+	initial_flooring = /decl/flooring/tiling/asteroidfloor
+
+/turf/simulated/floor/tiled/asteroid_steel/airless
+	name = "airless plating"
+	oxygen = 0
+	nitrogen = 0
+
 /turf/simulated/floor/tiled/white
 	name = "white floor"
 	icon_state = "white"