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

runtime nerfs

Browse Source
This commit is contained in:
deathride58
2017-09-16 23:44:39 -04:00
parent 9676b9f26d
commit a10f27ff14
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/citadel/crew_objectives/cit_crewobjectives_cargo.dm
+9 -9
View File
@@ -17,12 +17,12 @@
/datum/objective/crew/quartermaster/petsplosion/check_completion()
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 || SSshuttle.emergency.shuttle_areas[get_area(P)])
if!(P.stat == DEAD)
if(P.z == ZLEVEL_STATION_PRIMARY || 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 || SSshuttle.emergency.shuttle_areas[get_area(H)])
if!(H.stat == DEAD)
if(H.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(H)])
if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar))
petcount--
if(petcount <= 0)
@@ -47,12 +47,12 @@
/datum/objective/crew/cargotechnician/petsplosion/check_completion()
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 || SSshuttle.emergency.shuttle_areas[get_area(P)])
if!(P.stat == DEAD)
if(P.z == ZLEVEL_STATION_PRIMARY || 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 || SSshuttle.emergency.shuttle_areas[get_area(H)])
if!(H.stat == DEAD)
if(H.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(H)])
if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar))
petcount--
if(petcount <= 0)
@@ -67,6 +67,6 @@
/datum/objective/crew/shaftminer/bubblegum/check_completion()
for(var/mob/living/simple_animal/hostile/megafauna/bubblegum/B in GLOB.mob_list)
if(!B.stat == DEAD)
if!(B.stat == DEAD)
return FALSE
return TRUE
code/citadel/crew_objectives/cit_crewobjectives_civilian.dm
+3 -3
View File
@@ -68,7 +68,7 @@
/datum/objective/crew/bartender/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 || SSshuttle.emergency.shuttle_areas[get_area(H)])
if(H.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(H)])
return FALSE
return TRUE
@@ -76,13 +76,13 @@
/datum/objective/crew/janitor/clean //ported from old Hippie
var/list/areas = list()
var/hardmode = 0
var/hardmode = FALSE
explanation_text = "Ensure sure that (Yo, something broke. Yell about this in citadels devlopmeent discussion channel.) remain spotless at the end of the shift."
/datum/objective/crew/janitor/clean/New()
. = ..()
if(prob(1))
hardmode = 1
hardmode = TRUE
var/list/blacklistnormal = list(typesof(/area/space) - typesof(/area/lavaland) - typesof(/area/mine) - typesof(/area/ai_monitored/turret_protected) - typesof(/area/tcommsat))
var/list/blacklisthard = list(typesof(/area/lavaland) - typesof(/area/mine))
var/list/possibleareas = list()
code/citadel/crew_objectives/cit_crewobjectives_medical.dm
+4 -4
View File
@@ -7,7 +7,7 @@
/datum/objective/crew/chiefmedicalofficer/morgue/check_completion()
for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(H.stat == DEAD && H.z == ZLEVEL_STATION)
if(H.stat == DEAD && H.z == ZLEVEL_STATION_PRIMARY)
if(get_area(H) != /area/medical/morgue)
return FALSE
return TRUE
@@ -46,7 +46,7 @@
/datum/objective/crew/geneticist/morgue/check_completion()
for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(H.stat == DEAD && H.z == ZLEVEL_STATION)
if(H.stat == DEAD && H.z == ZLEVEL_STATION_PRIMARY)
if(get_area(H) != /area/medical/morgue)
return FALSE
return TRUE
@@ -119,7 +119,7 @@
/datum/objective/crew/virologist/noinfections/check_completion()
for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(!H.stat == DEAD)
if(H.z == ZLEVEL_STATION || SSshuttle.emergency.shuttle_areas[get_area(H)])
if(H.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(H)])
if(H.check_virus() == 2)
return FALSE
return TRUE
@@ -131,7 +131,7 @@
/datum/objective/crew/medicaldoctor/morgue/check_completion()
for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(H.stat == DEAD && H.z == ZLEVEL_STATION)
if(H.stat == DEAD && H.z == ZLEVEL_STATION_PRIMARY)
if(get_area(H) != /area/medical/morgue)
return FALSE
return TRUE