diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index d67361795e..2f778c0bda 100644 --- a/code/controllers/subsystem/air.dm +++ b/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 diff --git a/code/controllers/subsystem/processing/overlays.dm b/code/controllers/subsystem/processing/overlays.dm index 2c6bdb9c8f..f0cb9d210d 100644 --- a/code/controllers/subsystem/processing/overlays.dm +++ b/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) diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index e2ca23365b..f6c32d5c56 100644 --- a/code/game/turfs/space/transit.dm +++ b/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) diff --git a/code/modules/mob/new_player/sprite_accessories_Citadel.dm b/code/modules/mob/new_player/sprite_accessories_Citadel.dm index 013bc13099..d3fecb2d88 100644 --- a/code/modules/mob/new_player/sprite_accessories_Citadel.dm +++ b/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 *************** *******************************************/ diff --git a/icons/mob/mam_bodyparts.dmi b/icons/mob/mam_bodyparts.dmi index e390b5cc41..f8c2741d42 100644 Binary files a/icons/mob/mam_bodyparts.dmi and b/icons/mob/mam_bodyparts.dmi differ diff --git a/icons/mob/special/mam_body_markings.dmi b/icons/mob/special/mam_body_markings.dmi index b3a26ec991..140340efb0 100644 Binary files a/icons/mob/special/mam_body_markings.dmi and b/icons/mob/special/mam_body_markings.dmi differ