shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes compiling errors hopefully

Browse Source
This commit is contained in:
deathride58
2018-02-17 15:57:34 -05:00
parent d99e24931d
commit 6a7d414fdf
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/citadel/crew_objectives/cit_crewobjectives_cargo.dm
+2 -2
View File
@@ -17,11 +17,11 @@
var/petcount = target_amount var/petcount = target_amount
for(var/mob/living/simple_animal/pet/P in GLOB.mob_list) for(var/mob/living/simple_animal/pet/P in GLOB.mob_list)
if(!(P.stat == DEAD)) 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-- petcount--
for(var/mob/living/carbon/human/H in GLOB.mob_list) for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(!(H.stat == DEAD)) 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)) if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar))
petcount-- petcount--
if(petcount <= 0) if(petcount <= 0)
code/citadel/crew_objectives/cit_crewobjectives_civilian.dm
+1 -1
View File
@@ -65,7 +65,7 @@
/datum/objective/crew/responsibility/check_completion() /datum/objective/crew/responsibility/check_completion()
for(var/mob/living/carbon/human/H in GLOB.mob_list) for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(H.stat == DEAD && H.drunkenness >= 80) 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 FALSE
return TRUE return TRUE
code/citadel/crew_objectives/cit_crewobjectives_medical.dm
+2 -2
View File
@@ -6,7 +6,7 @@
/datum/objective/crew/morgue/check_completion() /datum/objective/crew/morgue/check_completion()
for(var/mob/living/carbon/human/H in GLOB.mob_list) 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) if(get_area(H) != /area/medical/morgue)
return FALSE return FALSE
return TRUE return TRUE
@@ -80,7 +80,7 @@
/datum/objective/crew/noinfections/check_completion() /datum/objective/crew/noinfections/check_completion()
for(var/mob/living/carbon/human/H in GLOB.mob_list) for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(!H.stat == DEAD) 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) if(H.check_virus() == 2)
return FALSE return FALSE
return TRUE return TRUE
code/modules/antagonists/borer/borer_event.dm
+1 -1
View File
@@ -26,7 +26,7 @@
for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in GLOB.machines) for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in GLOB.machines)
if(QDELETED(temp_vent)) if(QDELETED(temp_vent))
continue 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] var/datum/pipeline/temp_vent_parent = temp_vent.parents[1]
if(temp_vent_parent.other_atmosmch.len > 20) if(temp_vent_parent.other_atmosmch.len > 20)
vents += temp_vent vents += temp_vent