A lot of shuttle changes

_maps/shuttles/emergency_airless.dmm

@@ -110,6 +110,10 @@
 /obj/structure/shuttle/engine/propulsion,
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
+"s" = (
+/obj/machinery/status_display,
+/turf/closed/wall,
+/area/shuttle/escape)
 
 (1,1,1) = {"
 a
@@ -139,7 +143,7 @@ a
 a
 b
 c
-c
+s
 c
 b
 b
@@ -344,7 +348,7 @@ b
 b
 b
 c
-c
+s
 c
 b
 c

_maps/shuttles/emergency_bar.dmm

@@ -593,10 +593,11 @@
 /turf/open/floor/plasteel/freezer,
 /area/shuttle/escape)
 "bV" = (
-/obj/structure/grille,
+/obj/structure/table/wood/bar{
-/obj/structure/window/shuttle,
+	boot_dir = 8
-/obj/structure/sign/bluecross_2,
+	},
-/turf/open/floor/plasteel/airless/shuttle/white,
+/obj/effect/fun_balloon/sentience/emergency_shuttle,
+/turf/open/floor/plasteel/bar,
 /area/shuttle/escape)
 
 (1,1,1) = {"
@@ -736,7 +737,7 @@ aE
 aE
 aE
 aE
-bt
+aA
 bp
 bv
 by
@@ -777,7 +778,7 @@ bG
 aE
 aO
 aR
-aR
+bV
 aR
 aR
 aR

_maps/shuttles/emergency_clown.dmm

@@ -72,7 +72,7 @@
 /turf/open/floor/bluespace,
 /area/shuttle/escape)
 "an" = (
-/obj/item/toy/snappop,
+/obj/item/toy/snappop/phoenix,
 /turf/open/floor/bluespace,
 /area/shuttle/escape)
 "ao" = (
@@ -105,7 +105,7 @@
 	pixel_x = 0;
 	pixel_y = -29
 	},
-/obj/item/toy/snappop,
+/obj/item/toy/snappop/phoenix,
 /turf/open/floor/bluespace,
 /area/shuttle/escape)
 "at" = (
@@ -225,7 +225,7 @@
 	pixel_x = -5;
 	pixel_y = 30
 	},
-/obj/item/toy/snappop,
+/obj/item/toy/snappop/phoenix,
 /turf/open/floor/bluespace,
 /area/shuttle/escape)
 "aN" = (
@@ -233,7 +233,7 @@
 	pixel_x = 27;
 	pixel_y = 0
 	},
-/obj/item/toy/snappop,
+/obj/item/toy/snappop/phoenix,
 /turf/open/floor/bluespace,
 /area/shuttle/escape)
 "aO" = (
@@ -276,12 +276,11 @@
 	pixel_x = 0;
 	pixel_y = -30
 	},
-/obj/item/toy/snappop,
+/obj/item/toy/snappop/phoenix,
 /turf/open/floor/bluespace,
 /area/shuttle/escape)
 "aU" = (
-/obj/item/toy/snappop,
+/obj/item/toy/snappop/phoenix,
-/obj/item/toy/snappop,
 /turf/open/floor/bluespace,
 /area/shuttle/escape)
 "aV" = (

_maps/shuttles/emergency_goon.dmm

@@ -17,23 +17,14 @@
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "d" = (
-/turf/closed/wall/shuttle{
+/turf/closed/wall/shuttle/smooth/nodiagonal,
-	tag = "icon-swall0";
-	icon_state = "swall0"
-	},
 /area/shuttle/escape)
 "e" = (
-/turf/closed/wall/shuttle{
+/turf/closed/wall/shuttle/smooth/overspace,
-	tag = "icon-wall_space (NORTH)";
-	icon_state = "wall_space";
-	dir = 1
-	},
 /area/shuttle/escape)
 "f" = (
-/turf/closed/wall/shuttle{
+/obj/machinery/status_display,
-	tag = "icon-swall2";
+/turf/closed/wall/shuttle/smooth/nodiagonal,
-	icon_state = "swall2"
-	},
 /area/shuttle/escape)
 "g" = (
 /obj/machinery/door/airlock/shuttle{
@@ -76,10 +67,7 @@
 /area/shuttle/escape)
 "l" = (
 /obj/machinery/vending/wallmed,
-/turf/closed/wall/shuttle{
+/turf/closed/wall/shuttle/smooth/nodiagonal,
-	tag = "icon-swall8";
-	icon_state = "swall8"
-	},
 /area/shuttle/escape)
 "m" = (
 /obj/structure/window/shuttle,
@@ -267,49 +255,50 @@
 	},
 /area/shuttle/escape)
 "P" = (
+/obj/machinery/status_display,
 /turf/closed/wall/shuttle{
-	tag = "icon-wall_space";
+	tag = "icon-swall0";
-	icon_state = "wall_space"
+	icon_state = "swall0"
 	},
 /area/shuttle/escape)
 
 (1,1,1) = {"
 a
-i
+e
 b
 b
 b
-j
+d
 b
 b
 b
-P
+e
 a
 "}
 (2,1,1) = {"
 b
-j
+d
 p
 p
 p
-k
+d
 p
 p
 p
-j
+d
 b
 "}
 (3,1,1) = {"
 c
-k
+d
 q
 v
 q
-k
+d
 H
 H
 H
-k
+d
 c
 "}
 (4,1,1) = {"
@@ -318,25 +307,25 @@ l
 r
 r
 r
-C
+d
 H
 J
 H
-C
+d
 d
 "}
 (5,1,1) = {"
 e
-f
+d
-n
+d
 w
 f
-D
+d
-n
-K
 f
-n
+K
-N
+d
+d
+e
 "}
 (6,1,1) = {"
 a
@@ -365,8 +354,8 @@ m
 a
 "}
 (8,1,1) = {"
-f
+d
-n
+d
 s
 o
 d
@@ -374,8 +363,8 @@ m
 d
 o
 s
-f
+d
-n
+d
 "}
 (9,1,1) = {"
 g
@@ -404,8 +393,8 @@ o
 g
 "}
 (11,1,1) = {"
-f
+d
-n
+d
 s
 s
 o
@@ -413,8 +402,8 @@ o
 o
 s
 s
-f
+d
-n
+d
 "}
 (12,1,1) = {"
 a
@@ -462,10 +451,10 @@ d
 x
 d
 E
-d
+P
 x
 d
-N
+e
 a
 "}
 (16,1,1) = {"
@@ -490,20 +479,20 @@ A
 A
 A
 M
-N
+e
 a
 a
 "}
 (18,1,1) = {"
 a
 a
-u
+a
 x
 B
 G
 I
 x
-u
+a
 a
 a
 "}
@@ -515,7 +504,7 @@ e
 x
 x
 x
-N
+e
 a
 a
 a

_maps/shuttles/emergency_imfedupwiththisworld.dmm

@@ -164,6 +164,10 @@
 /obj/machinery/computer/emergency_shuttle,
 /turf/open/floor/carpet,
 /area/shuttle/escape)
+"E" = (
+/obj/machinery/status_display,
+/turf/closed/wall/mineral/wood,
+/area/shuttle/escape)
 
 (1,1,1) = {"
 a
@@ -238,7 +242,7 @@ o
 q
 s
 a
-a
+E
 C
 a
 "}

_maps/shuttles/emergency_wabbajack.dmm

@@ -179,10 +179,8 @@
 /turf/open/floor/plasteel/shuttle/white,
 /area/shuttle/escape)
 "aH" = (
-/turf/closed/wall/shuttle{
+/obj/machinery/status_display,
-	icon_state = "swall3";
+/turf/closed/wall/shuttle/smooth,
-	dir = 2
-	},
 /area/shuttle/escape)
 "aI" = (
 /obj/structure/chair{
@@ -334,34 +332,37 @@
 /obj/structure/shuttle/engine/propulsion,
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
+"bh" = (
+/turf/closed/wall/shuttle/smooth/overspace,
+/area/shuttle/escape)
 
 (1,1,1) = {"
 aa
 aa
 aa
 aa
-ab
+bh
 ab
 ab
 ax
 ab
 aD
-aH
+ab
 as
 as
 as
-aH
+ab
 aV
 ab
 aV
 ab
 ab
-ab
+bh
 aa
 "}
 (2,1,1) = {"
 aa
-ab
+bh
 ab
 ab
 ab
@@ -381,10 +382,10 @@ aW
 ba
 be
 ab
-ab
+bh
 "}
 (3,1,1) = {"
-ab
+bh
 ab
 ag
 ae
@@ -470,7 +471,7 @@ aq
 aq
 aq
 aq
-ab
+aH
 ab
 ab
 ab
@@ -528,11 +529,11 @@ bf
 bg
 "}
 (9,1,1) = {"
-ab
+bh
 ab
 ah
 ae
-ab
+aH
 aq
 aq
 aq
@@ -553,7 +554,7 @@ bg
 "}
 (10,1,1) = {"
 aa
-ab
+bh
 ab
 ab
 ab
@@ -573,14 +574,14 @@ aZ
 bd
 be
 ab
-ab
+bh
 "}
 (11,1,1) = {"
 aa
 aa
 aa
 aa
-ab
+bh
 as
 ab
 as
@@ -596,6 +597,6 @@ ab
 as
 ab
 ab
-ab
+bh
 aa
 "}

code/game/objects/items/toys.dm

@@ -330,38 +330,47 @@
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "snappop"
 	w_class = 1
+	var/ash_type = /obj/effect/decal/cleanable/ash
 
-/obj/item/toy/snappop/proc/pop_burst()
+/obj/item/toy/snappop/proc/pop_burst(var/n=3, var/c=1)
 	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-	s.set_up(3, 1, src)
+	s.set_up(n, c, src)
 	s.start()
-	new /obj/effect/decal/cleanable/ash(loc)
+	new ash_type(loc)
-	visible_message("<span class='warning'>The [src.name] explodes!</span>","<span class='italics'>You hear a snap!</span>")
+	visible_message("<span class='warning'>[src.name] explodes!</span>","<span class='italics'>You hear a snap!</span>")
 	playsound(src, 'sound/effects/snap.ogg', 50, 1)
 	qdel(src)
 
 /obj/item/toy/snappop/fire_act()
 	pop_burst()
-	return
 
 /obj/item/toy/snappop/throw_impact(atom/hit_atom)
 	if(!..())
 		pop_burst()
 
-
 /obj/item/toy/snappop/Crossed(H as mob|obj)
-	if((ishuman(H))) //i guess carp and shit shouldn't set them off
+	if(ishuman(H) || issilicon(H)) //i guess carp and shit shouldn't set them off
 		var/mob/living/carbon/M = H
-		if(M.m_intent == "run")
+		if(issilicon(H) || M.m_intent == "run")
 			M << "<span class='danger'>You step on the snap pop!</span>"
+			pop_burst(2, 0)
+
+/obj/item/toy/snappop/phoenix
+	name = "phoenix snap pop"
+	desc = "Wow! And wow! And wow!"
+	ash_type = /obj/effect/decal/cleanable/ash/snappop_phoenix
+
+/obj/effect/decal/cleanable/ash/snappop_phoenix
+	var/respawn_time = 300
+
+/obj/effect/decal/cleanable/ash/snappop_phoenix/New()
+	. = ..()
+	addtimer(src, "respawn", respawn_time)
+
+/obj/effect/decal/cleanable/ash/snappop_phoenix/proc/respawn()
+	new /obj/item/toy/snappop/phoenix(get_turf(src))
+	qdel(src)
 
-			var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-			s.set_up(2, 0, src)
-			s.start()
-			new /obj/effect/decal/cleanable/ash(src.loc)
-			src.visible_message("<span class='danger'>The [src.name] explodes!</span>","<span class='italics'>You hear a snap!</span>")
-			playsound(src, 'sound/effects/snap.ogg', 50, 1)
-			qdel(src)
 
 /*
  * Mech prizes

code/modules/mining/mine_turfs.dm

@@ -625,6 +625,9 @@
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	baseturf = /turf/open/chasm/straight_down/lava_land_surface
 
+/turf/open/chasm/straight_down/lava_land_surface/normal_air
+	initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
+
 /turf/open/chasm/straight_down/lava_land_surface/drop(atom/movable/AM)
 	if(!AM.invisibility)
 		AM.visible_message("<span class='boldwarning'>[AM] falls into [src]!</span>", "<span class='userdanger'>You stumble and stare into an abyss before you. It stares back, and you fall \