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

fixes

Browse Source
This commit is contained in:
deathride58
2017-09-07 01:01:23 -04:00
parent a972a6272f
commit d5151ed918
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/citadel/cit_crewobjectives.dm
+1 -1
View File
@@ -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)
code/citadel/crew_objectives/cit_crewobjectives_civilian.dm
+6 -6
View File
@@ -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
code/modules/mob/dead/new_player/new_player.dm
+1 -1
View File
@@ -367,7 +367,7 @@
if(GLOB.highlander)
to_chat(humanc, "<span class='userdanger'><i>THERE CAN BE ONLY ONE!!!</i></span>")
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)