diff --git a/code/citadel/cit_crewobjectives.dm b/code/citadel/cit_crewobjectives.dm index 5a5d0b2384..6afa92af65 100644 --- a/code/citadel/cit_crewobjectives.dm +++ b/code/citadel/cit_crewobjectives.dm @@ -17,7 +17,6 @@ if(!crewMind.assigned_role) return var/list/validobjs = crewobjjobs["[ckey(crewMind.assigned_role)]"] - //var/list/validobjs = get_valid_crew_objs(ckey(crewMind.assigned_role)) if(!validobjs || !validobjs.len) return var/selectedObj = pick(validobjs) @@ -29,15 +28,6 @@ to_chat(crewMind, "As a part of Nanotrasen's anti-tide efforts, you have been assigned an optional objective. It will be checked at the end of the shift. Performing traitorous acts in pursuit of your objective may result in termination of your employment.") to_chat(crewMind, "Your optional objective: [newObjective.explanation_text]") -/*/datum/controller/subsystem/ticker/proc/get_valid_crew_objs(var/job = "")//taken from old hippie with adjustments - var/list/objlist = list() - for(var/hoorayhackyshit in crewobjlist) - var/datum/objective/crew/obj = hoorayhackyshit //dm is not a sane language in any way, shape, or form. - var/list/availableto = splittext(initial(obj.jobs),",") - if(job in availableto) - objlist += obj - return objlist*/ - /datum/objective/crew/ var/jobs = "" explanation_text = "Yell on the development discussion channel on Citadels discord if this ever shows up. Something just broke here, dude" diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 2b3d1f9887..25e54aed64 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -128,7 +128,7 @@ SUBSYSTEM_DEF(ticker) crewobjlist = typesof(/datum/objective/crew) miscreantobjlist = (typesof(/datum/objective/miscreant) - /datum/objective/miscreant) - for(var/hoorayhackyshit in crewobjlist) + for(var/hoorayhackyshit in crewobjlist) //taken from old Hippie's "job2obj" proc with adjustments. var/datum/objective/crew/obj = hoorayhackyshit //dm is not a sane language in any way, shape, or form. var/list/availableto = splittext(initial(obj.jobs),",") for(var/job in availableto)