Merge pull request #293 from Verkister/master

New attempt at fixing shit. Also some sprite stuff.

code/controllers/subsystem/air.dm

@@ -203,8 +203,9 @@ var/datum/subsystem/air/SSair
 	while (high_pressure_delta.len)
 		var/turf/open/T = high_pressure_delta[high_pressure_delta.len]
 		high_pressure_delta.len--
-		T.high_pressure_movements()
-		T.pressure_difference = 0
+		if (isturf(T))
+			T.high_pressure_movements()
+			T.pressure_difference = 0
 		if(MC_TICK_CHECK)
 			return
 
@@ -218,7 +219,7 @@ var/datum/subsystem/air/SSair
 	while(currentrun.len)
 		var/turf/open/T = currentrun[currentrun.len]
 		currentrun.len--
-		if (isturf(T))
+		if (T && isturf(T))
 			T.process_cell(fire_count)
 		if (MC_TICK_CHECK)
 			return

code/controllers/subsystem/processing/overlays.dm

@@ -100,8 +100,11 @@ var/datum/subsystem/processing/overlays/SSoverlays
 		else
 			var/image/I = overlays[i]
 			appearance_bro.appearance = overlays[i]
-			appearance_bro.dir = I.dir
-			overlays[i] = appearance_bro.appearance
+			if(ismob(src) || istype(src,/obj/item))
+				overlays[i] = appearance_bro.appearance
+			else
+				appearance_bro.dir = I.dir
+				overlays[i] = appearance_bro.appearance
 
 	var/list/cached_overlays = our_overlays	//sanic
 	var/list/cached_priority = priority_overlays
@@ -130,8 +133,11 @@ var/datum/subsystem/processing/overlays/SSoverlays
 		else
 			var/image/I = overlays[i]
 			appearance_bro.appearance = overlays[i]
-			appearance_bro.dir = I.dir
-			overlays[i] = appearance_bro.appearance
+			if(ismob(src) || istype(src,/obj/item))
+				overlays[i] = appearance_bro.appearance
+			else
+				appearance_bro.dir = I.dir
+				overlays[i] = appearance_bro.appearance
 
 	LAZYINITLIST(our_overlays)	//always initialized after this point
 	LAZYINITLIST(priority_overlays)

code/game/turfs/space/transit.dm

@@ -80,6 +80,8 @@
 		if(EAST)
 			angle = 90
 			state = ((x+p*y) % 15) + 1
+			if(state < 1)
+				state += 15
 		if(WEST)
 			angle = -90
 			state = ((x-p*y) % 15) + 1
@@ -87,6 +89,8 @@
 				state += 15
 		else
 			state =	((p*x+y) % 15) + 1
+			if(state < 1)
+				state += 15
 
 	icon_state = "speedspace_ns_[state]"
 	transform = turn(matrix(), angle)

code/modules/mob/new_player/sprite_accessories_Citadel.dm

@@ -202,6 +202,12 @@
 	icon = 'icons/mob/mam_bodyparts.dmi'
 	extra = 1
 
+/datum/sprite_accessory/snouts/otie
+	name = "Otie"
+	icon_state = "otie"
+	icon = 'icons/mob/mam_bodyparts.dmi'
+	extra = 1
+
 /******************************************
 ************ Actual Species ***************
 *******************************************/