Merge branch 'master' into master

code/modules/research/designs/mecha_designs.dm

@@ -219,7 +219,7 @@
 
 /datum/design/mech_missile_rack
 	name = "Exosuit Weapon (SRM-8 Missile Rack)"
-	desc = "Allows for the construction of SRM-8 Missile Rack."
+	desc = "Allows for the construction of an SRM-8 Missile Rack."
 	id = "mech_missile_rack"
 	build_type = MECHFAB
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack

code/modules/research/designs/weapon_designs.dm

@@ -330,8 +330,8 @@
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
 
 /datum/design/suppressor
-	name = "Universal Suppressor"
-	desc = "A reverse-engineered universal suppressor that fits on most small arms with threaded barrels."
+	name = "Suppressor"
+	desc = "A reverse-engineered suppressor that fits on most small arms with threaded barrels."
 	id = "suppressor"
 	build_type = PROTOLATHE
 	materials = list(MAT_METAL = 2000, MAT_SILVER = 500)

code/modules/research/nanites/nanite_programs/healing.dm

@@ -70,9 +70,13 @@
 	rogue_types = list(/datum/nanite_program/brain_decay)
 
 /datum/nanite_program/brain_heal/check_conditions()
-	if(!host_mob.getBrainLoss())
-		return FALSE
-	return ..()
+	if(iscarbon(host_mob))
+		var/mob/living/carbon/C = host_mob
+		if(length(C.get_traumas()))
+			return ..()
+	if(host_mob.getBrainLoss())
+		return ..()
+	return FALSE
 
 /datum/nanite_program/brain_heal/active_effect()
 	host_mob.adjustBrainLoss(-1, TRUE)
@@ -187,10 +191,14 @@
 	rogue_types = list(/datum/nanite_program/brain_decay, /datum/nanite_program/brain_misfire)
 
 /datum/nanite_program/brain_heal_advanced/check_conditions()
-	if(!host_mob.getBrainLoss())
-		return FALSE
-	return ..()
-
+	if(iscarbon(host_mob))
+		var/mob/living/carbon/C = host_mob
+		if(length(C.get_traumas()))
+			return ..()
+	if(host_mob.getBrainLoss())
+		return ..()
+	return FALSE
+	
 /datum/nanite_program/brain_heal_advanced/active_effect()
 	host_mob.adjustBrainLoss(-2, TRUE)
 	if(iscarbon(host_mob) && prob(10))

code/modules/research/xenobiology/crossbreeding/chilling.dm

@@ -186,6 +186,7 @@ Chilling extracts:
 
 /obj/item/slimecross/chilling/sepia/do_effect(mob/user)
 	user.visible_message("<span class='warning'>[src] shatters, freezing time itself!</span>")
+	allies -= user //support class
 	new /obj/effect/timestop(get_turf(user), 2, 300, allies)
 	..()
 
@@ -267,7 +268,7 @@ Chilling extracts:
 	addtimer(CALLBACK(src, .proc/boom), 50)
 
 /obj/item/slimecross/chilling/oil/proc/boom()
-	explosion(get_turf(src), -1, -1, 3, 10) //Large radius, but mostly light damage.
+	explosion(get_turf(src), -1, -1, 10, 0) //Large radius, but mostly light damage, and no flash.
 	qdel(src)
 
 /obj/item/slimecross/chilling/black
@@ -307,4 +308,4 @@ Chilling extracts:
 	user.visible_message("<span class='warning'>[src] reflects an array of dazzling colors and light, energy rushing to nearby doors!</span>")
 	for(var/obj/machinery/door/airlock/door in area)
 		new /obj/effect/forcefield/slimewall/rainbow(door.loc)
-	return ..()
+	return ..()

code/modules/research/xenobiology/xenobiology.dm

@@ -633,6 +633,12 @@
 		to_chat(user, "<span class='warning'>The slime is dead!</span>")
 		return
 
+	if(M.rabid) //Stops being rabid, but doesn't become truly docile.
+		to_chat(M, "<span class='warning'>You absorb the potion, and your rabid hunger finally settles to a normal desire to feed.</span>")
+		to_chat(user, "<span class='notice'>You feed the slime the potion, calming its rabid rage.</span>")
+		M.rabid = FALSE
+		qdel(src)
+		return
 	M.docile = 1
 	M.nutrition = 700
 	to_chat(M, "<span class='warning'>You absorb the potion and feel your intense desire to feed melt away.</span>")