Merge branch 'master' into borgos

code/modules/arousal/organs/breasts.dm

@@ -76,16 +76,17 @@
 	..()
 
 /obj/item/organ/genital/breasts/size_to_state()
+	var/rounded = round(size)
 	var/str_size
-	switch(size)
+	switch(rounded)
 		if(0) //flatchested
 			str_size = "flat"
 		if(1 to 8) //modest
-			str_size = GLOB.breast_values[size]
+			str_size = GLOB.breast_values[rounded]
 		if(9 to 15) //massive
-			str_size = GLOB.breast_values[size]
+			str_size = GLOB.breast_values[rounded]
 		if(16 to 17) //ridiculous
-			str_size = GLOB.breast_values[size]
+			str_size = GLOB.breast_values[rounded]
 		if(18 to 24) //AWOOOOGAAAAAAA
 			str_size = "massive"
 		if(25 to 29) //AWOOOOOOGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

code/modules/arousal/organs/butt.dm

@@ -16,7 +16,7 @@
 	var/prev_size //former size value, to allow update_size() to early return should be there no significant changes.
 	layer_index = BUTT_LAYER_INDEX
 
-/obj/item/organ/genital/butt/modify_size(modifier, min = -INFINITY, max = INFINITY)
+/obj/item/organ/genital/butt/modify_size(modifier, min = -INFINITY, max = BUTT_SIZE_MAX)
 	var/new_value = clamp(size_cached + modifier, max(min, min_size ? min_size : -INFINITY), min(max_size ? max_size : INFINITY, max))
 	if(new_value == size_cached)
 		return

code/modules/asset_cache/asset_list_items.dm

@@ -594,3 +594,10 @@
 // 			blended_color = "#2eeb9a"
 // 	pre_asset.Blend(blended_color, ICON_MULTIPLY)
 // 	return pre_asset
+
+/datum/asset/spritesheet/jobs
+	name = "jobs"
+
+/datum/asset/spritesheet/jobs/register()
+	InsertAll("", 'icons/UI_Icons/tgui/jobs.dmi')
+	..()

code/modules/language/language_holder.dm

@@ -321,7 +321,8 @@ Key procs
 								/datum/language/modular_sand/solcommon = list(LANGUAGE_ATOM),
 								/datum/language/modular_sand/technorussian = list(LANGUAGE_ATOM),
 								/datum/language/modular_sand/dunmeri = list(LANGUAGE_ATOM),
-								/datum/language/modular_sand/sergal = list(LANGUAGE_ATOM))
+								/datum/language/modular_sand/sergal = list(LANGUAGE_ATOM),
+								/datum/language/signlanguage = list(LANGUAGE_ATOM))
 	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
 							/datum/language/machine = list(LANGUAGE_ATOM),
 							/datum/language/draconic = list(LANGUAGE_ATOM),

code/modules/mining/equipment/resonator.dm

@@ -96,6 +96,7 @@
 	new /obj/effect/temp_visual/resonance_crush(T)
 	if(ismineralturf(T))
 		var/turf/closed/mineral/M = T
+		replicate(M)
 		M.gets_drilled(creator)
 	check_pressure(T)
 	playsound(T,'sound/weapons/resonator_blast.ogg',50,1)
@@ -115,3 +116,10 @@
 	. = ..()
 	transform = matrix()*1.5
 	animate(src, transform = matrix()*0.1, alpha = 50, time = 4)
+
+/obj/effect/temp_visual/resonance/proc/replicate(turf/closed/mineral/M)	//yogs start: adds replication to resonator fields
+	if(!istype(M) || !M.mineralType) // so we don't end up in the ultimate chain reaction
+		return
+	for(var/turf/closed/mineral/T in orange(1, M))
+		if(istype(T) && T.mineralType)
+			new /obj/effect/temp_visual/resonance(T, creator, null, duration)	//yogs end

code/modules/mob/dead/observer/orbit.dm

@@ -90,6 +90,14 @@
 						antagonists += list(serialized)
 						break
 
+				var/assignment = "no_id"
+
+				var/obj/item/card/id/card = M.get_idcard()
+				if(card)
+					assignment = "[ckey(card.get_job_name())]"
+
+				serialized["assignment"] = assignment
+
 				if (!was_antagonist)
 					alive += list(serialized)
 		else
@@ -107,4 +115,4 @@
 /datum/orbit_menu/ui_assets()
 	. = ..() || list()
 	. += get_asset_datum(/datum/asset/simple/orbit)
-
+	. += get_asset_datum(/datum/asset/spritesheet/jobs)

code/modules/mob/living/damage_procs.dm

@@ -15,6 +15,7 @@
   * Returns TRUE if damage applied
   */
 /mob/living/proc/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE)
+	SEND_SIGNAL(src, COMSIG_MOB_APPLY_DAMAGE, damage, damagetype, def_zone, blocked, forced, spread_damage, wound_bonus, bare_wound_bonus, sharpness)
 	var/hit_percent = (100-blocked)/100
 	if(!damage || (hit_percent <= 0))
 		return 0

code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm

@@ -79,7 +79,7 @@
 		target = null
 		return
 	return ..()
-/*
+
 /mob/living/simple_animal/hostile/megafauna/death(gibbed, list/force_grant)
 	if(health > 0)
 		return
@@ -96,7 +96,6 @@
 			grant_achievement(achievement_type, score_achievement_type, crusher_kill, force_grant)
 			SSblackbox.record_feedback("tally", tab, 1, "[initial(name)]")
 	return ..()
-*/
 
 /mob/living/simple_animal/hostile/megafauna/proc/spawn_crusher_loot()
 	loot = crusher_loot