Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation

code/game/machinery/kitchen/cooking_machines/candy.dm

@@ -5,6 +5,8 @@
 	off_icon = "mixer_off"
 	on_icon = "mixer_on"
 	cook_type = "candied"
+	can_burn_food = 0
+	cooked_sound = 'sound/machines/ding.ogg'
 
 	output_options = list(
 		"Jawbreaker" = /obj/item/weapon/reagent_containers/food/snacks/variable/jawbreaker,

code/game/machinery/kitchen/cooking_machines/cereal.dm

@@ -6,6 +6,8 @@
 	cook_type = "cerealized"
 	on_icon = "cereal_on"
 	off_icon = "cereal_off"
+	can_burn_food = 0
+	cooked_sound = 'sound/machines/ding.ogg'
 
 /obj/machinery/cooker/cereal/change_product_strings(var/obj/item/weapon/reagent_containers/food/snacks/product)
 	. = ..()

code/game/machinery/kitchen/cooking_machines/grill.dm

@@ -7,4 +7,5 @@
 	food_color = "#A34719"
 	on_icon = "grill_on"
 	off_icon = "grill_off"
-	can_burn_food = 1
+	can_burn_food = 0
+	cooked_sound = 'sound/machines/ding.ogg'

code/game/machinery/kitchen/cooking_machines/oven.dm

@@ -8,7 +8,8 @@
 	cook_type = "baked"
 	cook_time = 300
 	food_color = "#A34719"
-	can_burn_food = 1
+	can_burn_food = 0
+	cooked_sound = 'sound/machines/ding.ogg'
 
 	output_options = list(
 		"Personal Pizza" = /obj/item/weapon/reagent_containers/food/snacks/variable/pizza,

code/game/verbs/character_directory.dm

@@ -0,0 +1,37 @@
+/client/verb/show_character_directory()
+	set name = "Character Directory"
+	set category = "OOC"
+	set desc = "Shows a listing of all active characters, along with their associated OOC notes, flavor text, and more."
+
+	if(mob.next_move >= world.time)	//This is primarily to stop malicious users from trying to lag the server by spamming this verb
+		return
+
+	mob.next_move = world.time + 10
+
+	var/html = "<script> function togglesection(targetsection) { var targettext = document.getElementById(targetsection); if (targettext.style.display === 'none') { targettext.style.display = ''; } else { targettext.style.display = 'none'; } } </script>"
+
+	var/curID = 0
+	for(var/client/C in clients)
+		if(C.prefs && !C.prefs.show_in_directory)
+			continue
+		if(ishuman(C.mob))
+			var/mob/living/carbon/human/H = C.mob
+			if(data_core && data_core.general)
+				if(!find_general_record("name", H.real_name))
+					continue
+			curID++
+			html += "<div class='block'>"
+			html += "<h3 class='uiContent highlight' style='font-size:16px'>[H.real_name]</h3><br>"
+			if(H.flavor_texts["general"])
+				html += "<a onclick='togglesection(\"[ckey(H.real_name)] [curID] flavor\")'>Flavor text</a>"
+				html += "<p class='uiContent' style='display:none' id='[ckey(H.real_name)] [curID] flavor'>[H.flavor_texts["general"]]</p>"
+			if(H.ooc_notes)
+				html += "<a onclick='togglesection(\"[ckey(H.real_name)] [curID] ooc\")'>OOC notes</a>"
+				html += "<p class='uiContent' style='display:none' id='[ckey(H.real_name)] [curID] ooc'>[H.ooc_notes]</p>"
+			html += "</div>"
+	if(!curID)
+		html += "<p class='uiContent'>404: Station not found</p>"
+
+	var/datum/browser/popup = new(mob, "chardir", "Character Directory", 640, 480)
+	popup.set_content(html)
+	popup.open()

code/modules/client/preference_setup/vore/09_misc.dm

@@ -0,0 +1,26 @@
+/datum/preferences
+	var/show_in_directory = TRUE
+
+/datum/category_item/player_setup_item/vore/misc
+	name = "Misc Settings"
+	sort_order = 9
+
+/datum/category_item/player_setup_item/vore/misc/load_character(var/savefile/S)
+	S["show_in_directory"]		>> pref.show_in_directory
+
+
+/datum/category_item/player_setup_item/vore/misc/save_character(var/savefile/S)
+	S["show_in_directory"]		<< pref.show_in_directory
+
+/datum/category_item/player_setup_item/vore/misc/sanitize_character()
+	pref.show_in_directory		= sanitize_integer(pref.show_in_directory, 0, 1, initial(pref.show_in_directory))
+
+/datum/category_item/player_setup_item/vore/misc/content(var/mob/user)
+	. += "<br>"
+	. += "<b>Appear in Character Directory:</b> <a [pref.show_in_directory ? "class='linkOn'" : ""] href='?src=\ref[src];toggle_show_in_directory=1'><b>[pref.show_in_directory ? "Yes" : "No"]</b></a><br>"
+
+/datum/category_item/player_setup_item/vore/misc/OnTopic(var/href, var/list/href_list, var/mob/user)
+	if(href_list["toggle_show_in_directory"])
+		pref.show_in_directory = pref.show_in_directory ? 0 : 1;
+		return TOPIC_REFRESH
+	return ..();

code/modules/mob/living/carbon/human/species/station/prometheans.dm

@@ -20,7 +20,7 @@ var/datum/species/shapeshifter/promethean/prometheans
 
 	hunger_factor =    0.2
 	reagent_tag =      IS_SLIME
-	mob_size =         MOB_SMALL
+	mob_size =         MOB_MEDIUM
 	bump_flag =        SLIME
 	swap_flags =       MONKEY|SLIME|SIMPLE_ANIMAL
 	push_flags =       MONKEY|SLIME|SIMPLE_ANIMAL

code/modules/mob/new_player/sprite_accessories_ch.dm

@@ -0,0 +1,26 @@
+/datum/sprite_accessory/marking/ch
+	icon = 'icons/mob/human_races/markings_ch.dmi'
+
+	orca_head
+		name = "Orca head"
+		icon_state = "orca_head"
+		color_blend_mode = ICON_MULTIPLY
+		body_parts = list(BP_HEAD)
+
+	orca_body
+		name = "Orca body"
+		icon_state = "orca_body"
+		color_blend_mode = ICON_MULTIPLY
+		body_parts = list(BP_TORSO)
+
+	orca_legs
+		name = "Orca legs"
+		icon_state = "orca_leg"
+		color_blend_mode = ICON_MULTIPLY
+		body_parts = list(BP_L_LEG,BP_R_LEG)
+
+	orca_arms
+		name = "Orca arms"
+		icon_state = "orca_arm"
+		color_blend_mode = ICON_MULTIPLY
+		body_parts = list(BP_L_ARM,BP_R_ARM)

vorestation.dme

@@ -1291,6 +1291,7 @@
 #include "code\game\turfs\unsimulated\sky_vr.dm"
 #include "code\game\turfs\unsimulated\walls.dm"
 #include "code\game\verbs\advanced_who.dm"
+#include "code\game\verbs\character_directory.dm"
 #include "code\game\verbs\ignore.dm"
 #include "code\game\verbs\ooc.dm"
 #include "code\game\verbs\suicide.dm"
@@ -1504,6 +1505,7 @@
 #include "code\modules\client\preference_setup\vore\06_vantag.dm"
 #include "code\modules\client\preference_setup\vore\07_traits.dm"
 #include "code\modules\client\preference_setup\vore\08_nif.dm"
+#include "code\modules\client\preference_setup\vore\09_misc.dm"
 #include "code\modules\clothing\chameleon.dm"
 #include "code\modules\clothing\clothing.dm"
 #include "code\modules\clothing\clothing_accessories.dm"
@@ -2263,6 +2265,7 @@
 #include "code\modules\mob\new_player\preferences_setup_vr.dm"
 #include "code\modules\mob\new_player\skill.dm"
 #include "code\modules\mob\new_player\sprite_accessories.dm"
+#include "code\modules\mob\new_player\sprite_accessories_ch.dm"
 #include "code\modules\mob\new_player\sprite_accessories_vr.dm"
 #include "code\modules\multiz\_stubs.dm"
 #include "code\modules\multiz\basic.dm"