diff --git a/code/citadel/crew_objectives/cit_crewobjectives_cargo.dm b/code/citadel/crew_objectives/cit_crewobjectives_cargo.dm index d164123c4d..010337b49f 100644 --- a/code/citadel/crew_objectives/cit_crewobjectives_cargo.dm +++ b/code/citadel/crew_objectives/cit_crewobjectives_cargo.dm @@ -17,11 +17,11 @@ var/petcount = target_amount for(var/mob/living/simple_animal/pet/P in GLOB.mob_list) if(!(P.stat == DEAD)) - if(P.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(P)]) + if(P.z == SSmapping.station_start || SSshuttle.emergency.shuttle_areas[get_area(P)]) petcount-- for(var/mob/living/carbon/human/H in GLOB.mob_list) if(!(H.stat == DEAD)) - if(H.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(H)]) + if(H.z == SSmapping.station_start || SSshuttle.emergency.shuttle_areas[get_area(H)]) if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar)) petcount-- if(petcount <= 0) diff --git a/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm b/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm index 0a867266ad..c0e6cf6bb1 100644 --- a/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm +++ b/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm @@ -65,7 +65,7 @@ /datum/objective/crew/responsibility/check_completion() for(var/mob/living/carbon/human/H in GLOB.mob_list) if(H.stat == DEAD && H.drunkenness >= 80) - if(H.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(H)]) + if(H.z == SSmapping.station_start || SSshuttle.emergency.shuttle_areas[get_area(H)]) return FALSE return TRUE diff --git a/code/citadel/crew_objectives/cit_crewobjectives_medical.dm b/code/citadel/crew_objectives/cit_crewobjectives_medical.dm index 53a9dc73aa..21d7a040aa 100644 --- a/code/citadel/crew_objectives/cit_crewobjectives_medical.dm +++ b/code/citadel/crew_objectives/cit_crewobjectives_medical.dm @@ -6,7 +6,7 @@ /datum/objective/crew/morgue/check_completion() for(var/mob/living/carbon/human/H in GLOB.mob_list) - if(H.stat == DEAD && H.z == ZLEVEL_STATION_PRIMARY) + if(H.stat == DEAD && H.z == SSmapping.station_start) if(get_area(H) != /area/medical/morgue) return FALSE return TRUE @@ -80,7 +80,7 @@ /datum/objective/crew/noinfections/check_completion() for(var/mob/living/carbon/human/H in GLOB.mob_list) if(!H.stat == DEAD) - if(H.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(H)]) + if(H.z == SSmapping.station_start || SSshuttle.emergency.shuttle_areas[get_area(H)]) if(H.check_virus() == 2) return FALSE return TRUE diff --git a/code/modules/antagonists/borer/borer_event.dm b/code/modules/antagonists/borer/borer_event.dm index e036c2a474..94af2f1be7 100644 --- a/code/modules/antagonists/borer/borer_event.dm +++ b/code/modules/antagonists/borer/borer_event.dm @@ -26,7 +26,7 @@ for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in GLOB.machines) if(QDELETED(temp_vent)) continue - if(temp_vent.loc.z == ZLEVEL_STATION_PRIMARY && !temp_vent.welded) + if(temp_vent.loc.z == SSmapping.station_start && !temp_vent.welded) var/datum/pipeline/temp_vent_parent = temp_vent.parents[1] if(temp_vent_parent.other_atmosmch.len > 20) vents += temp_vent