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

engineering objectives, removes assistant petsplosion

Browse Source
This commit is contained in:
deathride58
2017-09-07 15:43:17 -04:00
parent d5151ed918
commit f8d149975f
3 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/citadel/crew_objectives/cit_crewobjectives_civilian.dm
+4 -32
View File
@@ -87,14 +87,14 @@
/datum/objective/crew/janitor/clean/update_explanation_text()
. = ..()
explanation_text = "Ensure that the "
explanation_text = "Ensure that the"
for(var/i in 1 to areas.len)
var/area/A = areas[i]
explanation_text += "[A]"
explanation_text += " [A]"
if(i != areas.len && areas.len >= 3)
explanation_text += ", "
explanation_text += ","
if(i == areas.len - 1)
explanation_text += "and "
explanation_text += "and"
explanation_text += " [(areas.len ==1) ? "is completely" : "are [(areas.len == 2) ? "completely" : "all"]"] clean at the end of the shift."
/datum/objective/crew/janitor/clean/check_completion()
@@ -163,31 +163,3 @@
if(istype(H.w_uniform, targetuniform))
return 1
return 0
/datum/objective/crew/assistant/petsplosion
explanation_text = "Ensure there are at least (If you see this, yell on citadels discord in the development discussion channel) pets on the station by the end of the shift. Interpret this as you wish."
/datum/objective/crew/assistant/petsplosion/New()
. = ..()
target_amount = rand(10,20)
update_explanation_text()
/datum/objective/crew/assistant/petsplosion/update_explanation_text()
. = ..()
explanation_text = "Ensure there are at least [target_amount] pets on the station by the end of the shift. Interpret this as you wish."
/datum/objective/crew/assistant/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)])
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(istype(H.wear_neck, /obj/item/clothing/neck/petcollar))
petcount--
if(petcount <= 0)
return 1
else
return 0
code/citadel/crew_objectives/cit_crewobjectives_engineering.dm
+47
View File
@@ -0,0 +1,47 @@
/* ENGINEERING OBJECTIVES */
/datum/objective/crew/chiefengineer
/datum/objective/crew/chiefengineer/integrity //ported from old Hippie
explanation_text = "Ensure the station's integrity rating is at least (Yo something broke, yell on the development discussion channel of citadels discord about this)% when the shift ends."
/datum/objective/crew/chiefengineer/integrity/New()
. = ..()
target_amount = rand(60,95)
update_explanation_text()
/datum/objective/crew/chiefengineer/integrity/update_explanation_text()
. = ..()
explanation_text = "Ensure the station's integrity rating is at least [target_amount]% when the shift ends."
/datum/objective/crew/chiefengineer/integrity/check_completion()
var/datum/station_state/end_state = new /datum/station_state()
end_state.count()
var/station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100)
if(!SSticker.mode.station_was_nuked && station_integrity >= target_amount)
return 1
else
return 0
/datum/objective/crew/stationengineer
/datum/objective/crew/stationengineer/integrity
explanation_text = "Ensure the station's integrity rating is at least (Yo something broke, yell on the development discussion channel of citadels discord about this)% when the shift ends."
/datum/objective/crew/stationengineer/integrity/New()
. = ..()
target_amount = rand(60,95)
update_explanation_text()
/datum/objective/crew/stationengineer/integrity/update_explanation_text()
. = ..()
explanation_text = "Ensure the station's integrity rating is at least [target_amount]% when the shift ends."
/datum/objective/crew/stationengineer/integrity/check_completion()
var/datum/station_state/end_state = new /datum/station_state()
end_state.count()
var/station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100)
if(!SSticker.mode.station_was_nuked && station_integrity >= target_amount)
return 1
else
return 0
tgstation.dme
+1
View File
@@ -178,6 +178,7 @@
#include "code\citadel\crew_objectives\cit_crewobjectives_cargo.dm"
#include "code\citadel\crew_objectives\cit_crewobjectives_civilian.dm"
#include "code\citadel\crew_objectives\cit_crewobjectives_command.dm"
#include "code\citadel\crew_objectives\cit_crewobjectives_engineering.dm"
#include "code\citadel\crew_objectives\cit_crewobjectives_medical.dm"
#include "code\citadel\crew_objectives\cit_crewobjectives_science.dm"
#include "code\citadel\crew_objectives\cit_crewobjectives_security.dm"