diff --git a/code/citadel/cit_crewobjectives.dm b/code/citadel/cit_crewobjectives.dm index 83422bd054..f40d1fff3c 100644 --- a/code/citadel/cit_crewobjectives.dm +++ b/code/citadel/cit_crewobjectives.dm @@ -1,6 +1,6 @@ /datum/controller/subsystem/ticker/proc/generate_crew_objectives() for(var/datum/mind/crewMind in SSticker.minds) - if(prob(10) && GLOB.master_mode != "extended")//extended is supposed to have less chaos + if(prob(10) && !issilicon(crewMind.current) && GLOB.master_mode != "extended")//extended is supposed to have less chaos generate_miscreant_objectives(crewMind) else generate_individual_objectives(crewMind) diff --git a/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm b/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm index dc461041dd..188b825a3b 100644 --- a/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm +++ b/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm @@ -34,27 +34,27 @@ else return 0 -/datum/objective/crew/chef +/datum/objective/crew/cook -/datum/objective/crew/chef/foodhoard +/datum/objective/crew/cook/foodhoard var/datum/crafting_recipe/food/targetfood var/obj/item/reagent_containers/food/foodpath explanation_text = "Personally deliver at least (yo something broke) (report this to the developer discussion channel in citadels discord)s to Centcom." -/datum/objective/crew/chef/foodhoard/New() +/datum/objective/crew/cook/foodhoard/New() . = ..() target_amount = rand(2,10) var/blacklist = list(/datum/crafting_recipe/food) var/possiblefoods = typesof(/datum/crafting_recipe/food) - blacklist targetfood = pick(possiblefoods) - foodpath = targetfood.result + foodpath = initial(targetfood.result) update_explanation_text() -/datum/objective/crew/chef/foodhoard/update_explanation_text() +/datum/objective/crew/cook/foodhoard/update_explanation_text() . = ..() explanation_text = "Personally deliver at least [target_amount] [initial(foodpath.name)]s to Centcom." -/datum/objective/crew/chef/foodhoard/check_completion() +/datum/objective/crew/cook/foodhoard/check_completion() if(owner.current && owner.current.check_contents_for(foodpath) && SSshuttle.emergency.shuttle_areas[get_area(owner.current)]) return 1 else diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 428773bd9b..19ed0bed9d 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -367,7 +367,7 @@ if(GLOB.highlander) to_chat(humanc, "THERE CAN BE ONLY ONE!!!") humanc.make_scottish() - if(prob(10) && GLOB.master_mode != "extended") + if(prob(10) && !issilicon(humanc) && GLOB.master_mode != "extended") SSticker.generate_miscreant_objectives(humanc.mind) else SSticker.generate_individual_objectives(humanc.mind)