Merge remote-tracking branch 'upstream/master' into PortsPsionics

Author: cowbot92

code/__DEFINES/{yogs_defines}/mobs.dm

@@ -16,3 +16,27 @@
 #define SPECIES_VOX "vox"
 
 #define BUTT_SPRITE_VOX "vox"
+
+
+GLOBAL_REAL_VAR(list/voice_type2sound = list(
+	"1" = list(
+		"1" = sound('goon/sound/speak_1.ogg'),
+		"!" = sound('goon/sound/speak_1_exclaim.ogg'),
+		"?" = sound('goon/sound/speak_1_ask.ogg')
+	),
+	"2" = list(
+		"2" = sound('goon/sound/speak_2.ogg'),
+		"!" = sound('goon/sound/speak_2_exclaim.ogg'),
+		"?" = sound('goon/sound/speak_2_ask.ogg')
+	),
+	"3" = list(
+		"3" = sound('goon/sound/speak_3.ogg'),
+		"!" = sound('goon/sound/speak_3_exclaim.ogg'),
+		"?" = sound('goon/sound/speak_3_ask.ogg')
+	),
+	"4" = list(
+		"4" = sound('goon/sound/speak_4.ogg'),
+		"!" = sound('goon/sound/speak_4_exclaim.ogg'),
+		"?" = sound('goon/sound/speak_4_ask.ogg')
+	),
+))

code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm

@@ -14,7 +14,7 @@
 	RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp))
 	ADD_TRAIT(user, TRAIT_RESISTCOLD, INNATE_TRAIT)
 	ADD_TRAIT(user, TRAIT_NOSLIPICE, INNATE_TRAIT)
-	
+
 
 	var/datum/action/cooldown/spell/basic_jaunt = locate(/datum/action/cooldown/spell/jaunt/ethereal_jaunt/basic) in user.actions
 	if(basic_jaunt)
@@ -99,7 +99,7 @@
 	cost = 1
 	route = PATH_VOID
 	tier = TIER_2
-	
+
 /datum/eldritch_knowledge/cold_snap/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
 	. = ..()
 	user.add_traits(list(TRAIT_NOBREATH, TRAIT_RESISTCOLD, TRAIT_NOSLIPICE), type)
@@ -162,7 +162,7 @@
 	desc = "Allows you to transmute any ballistic weapon, with \
 		a plank of wood, a piece of gold and a camera to create the Lionhunter's rifle. \
 		The Lionhunter's Rifle is a long ranged ballistic weapon with three shots. \
-		These shots function as normal, albeit weak high caliber mutitions when fired from \
+		These shots function as normal, albeit weak high-caliber munitions when fired from \
 		close range or at inanimate objects. You can aim the rifle at distant foes, \
 		causing the shot to deal massively increased damage and hone in on them. \
 		You can create more ammo with three casings and five bars of silver."

code/modules/cargo/packs.dm

@@ -1234,8 +1234,9 @@
 
 /datum/supply_pack/engine/fuel_rod_basic
 	name = "Uranium-235 Fuel Rods Crate"
-	desc = "Contains 5 Enriched Uranium Control Rods."
+	desc = "Contains 5 Enriched Uranium Control Rods. Requires engineering access to open."
 	cost = 5000
+	access_view = ACCESS_ENGINEERING
 	contains = list(/obj/item/fuel_rod,
 					/obj/item/fuel_rod,
 					/obj/item/fuel_rod,
@@ -1247,8 +1248,9 @@
 
 /datum/supply_pack/engine/fuel_rod_plutonium
 	name = "Plutonium-239 Fuel Rods Crate"
-	desc = "Contains 5 Plutonium-239 Control Rods."
+	desc = "Contains 5 Plutonium-239 Control Rods. Requires engineering access to open."
 	cost = 15000
+	access_view = ACCESS_ENGINEERING
 	contains = list(/obj/item/fuel_rod/plutonium,
 					/obj/item/fuel_rod/plutonium,
 					/obj/item/fuel_rod/plutonium,

code/modules/food_and_drinks/food/snacks_pastry.dm

@@ -8,7 +8,7 @@
 	icon_state = "donut1"
 	bitesize = 5
 	bonus_reagents = list(/datum/reagent/consumable/sugar = 1)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/sugar = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 2)
 	filling_color = "#D2691E"
 	tastes = list("donut" = 1)
 	foodtype = JUNKFOOD | GRAIN | FRIED | SUGAR | BREAKFAST
@@ -27,7 +27,7 @@
 	is_frosted = TRUE
 	name = "frosted [name]"
 	icon_state = frosted_icon //delish!
-	reagents.add_reagent(/datum/reagent/consumable/sprinkles, 1)
+	reagents.add_reagent(/datum/reagent/consumable/sprinkles, 2)
 	filling_color = "#FF69B4"
 	return TRUE
 

code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm

@@ -31,6 +31,12 @@
 	result = /obj/item/reagent_containers/food/snacks/donut
 	category = CAT_PASTRY
 
+/datum/crafting_recipe/food/donut/on_craft_completion(mob/user, atom/result)
+	. = ..()
+	var/obj/item/reagent_containers/food/snacks/donut/donut_result = result
+	if(donut_result.is_frosted)
+		donut_result.reagents.add_reagent(/datum/reagent/consumable/sprinkles, 2)
+
 /datum/crafting_recipe/food/jellydonut
 	name = "Jelly Donut"
 	reqs = list(

code/modules/mob/living/living.dm

@@ -11,6 +11,8 @@
 	GLOB.mob_living_list += src
 	if(startDead)
 		death(FALSE)
+	if(!voice_type)
+		voice_type = pick(voice_type2sound) //yogs edit (stolen from monke)
 
 /mob/living/prepare_huds()
 	..()
@@ -178,20 +180,17 @@
 			return TRUE
 
 /mob/living/get_photo_description(obj/item/camera/camera)
-	var/list/mob_details = list()
 	var/list/holding = list()
 	var/len = length(held_items)
 	if(len)
 		for(var/obj/item/I in held_items)
 			if(!holding.len)
 				holding += "They are holding \a [I]"
 			else if(held_items.Find(I) == len)
-				holding += ", and \a [I]."
+				holding += ", and \a [I]"
 			else
 				holding += ", \a [I]"
-	holding += "."
-	mob_details += "You can also see [src] on the photo[health < (maxHealth * 0.75) ? ", looking a bit hurt":""][holding ? ". [holding.Join("")]":"."]."
-	return mob_details.Join("")
+	return "You can also see [src] on the photo[health < (maxHealth * 0.75) ? ", looking a bit hurt":""][holding.len ? ". [holding.Join("")].":"."]"
 
 //Called when we bump onto an obj
 /mob/living/proc/ObjBump(obj/O)

code/modules/mob/living/say.dm

@@ -234,6 +234,21 @@ GLOBAL_LIST_INIT(special_radio_keys, list(
 
 	send_speech(message, message_range, src, bubble_type, spans, language, message_mods)
 
+	//yogs edit (stolen from monkestation)
+	///Play a sound to indicate we just spoke
+	if(client && !HAS_TRAIT(src, TRAIT_SIGN_LANG))
+		var/ending = copytext_char(message, -1)
+		var/sound/speak_sound
+		if(SPAN_HELIUM in spans)
+			speak_sound = sound('sound/effects/mousesqueek.ogg')
+		else if(ending == "?")
+			speak_sound = voice_type2sound[voice_type]["?"]
+		else if(ending == "!")
+			speak_sound = voice_type2sound[voice_type]["!"]
+		else
+			speak_sound = voice_type2sound[voice_type][voice_type]
+		playsound(src, speak_sound, 300, 1, SHORT_RANGE_SOUND_EXTRARANGE-2, falloff_exponent = 1, pressure_affected = FALSE, ignore_walls = FALSE, use_reverb = FALSE)
+	//yogs change end
 
 	return on_say_success(message,message_range,succumbed, spans, language, message_mods)//Yogs
 

code/modules/photography/camera/camera.dm

@@ -249,7 +249,7 @@
 	temp.Scale(psize_x, psize_y)
 	temp.Blend(get_icon, ICON_OVERLAY)
 
-	var/datum/picture/P = new("picture", desc.Join(" "), minds_spotted, dead_spotted, temp, null, psize_x, psize_y, blueprints)
+	var/datum/picture/P = new("picture", desc.Join("<br>"), minds_spotted, dead_spotted, temp, null, psize_x, psize_y, blueprints)
 	after_picture(user, P, flag)
 	blending = FALSE
 

code/modules/reagents/reagent_containers/medspray.dm

@@ -14,8 +14,8 @@
 	w_class = WEIGHT_CLASS_SMALL
 	throw_speed = 3
 	throw_range = 7
-	amount_per_transfer_from_this = 10
-	volume = 30
+	amount_per_transfer_from_this = 25
+	volume = 100
 	var/can_fill_from_container = TRUE
 	var/apply_type = PATCH
 	var/apply_method = "spray"