Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature

code/modules/mob/living/carbon/human/human_defense.dm

@@ -153,21 +153,8 @@ emp_act
 			if(ishuman(user))
 				var/mob/living/carbon/human/H = user
 				if(get_dist(H, src) > 1) //people with TK won't get smeared with blood
-					if(H.wear_suit)
-						H.wear_suit.add_blood(src)
-						H.update_inv_wear_suit(0)	//updates mob overlays to show the new blood (no refresh)
-					else if(H.w_uniform)
-						H.w_uniform.add_blood(src)
-						H.update_inv_w_uniform(0)	//updates mob overlays to show the new blood (no refresh)
-					if (H.gloves)
-						H.gloves.add_blood(H)
-						H.gloves:transfer_blood = 2
-						H.gloves:bloody_hands_mob = H
-					else
-						H.add_blood(H)
-						H.bloody_hands = 2
-						H.bloody_hands_mob = H
-					H.update_inv_gloves()		//updates on-mob overlays for bloody hands and/or bloody gloves
+					H.bloody_body(src)
+					H.bloody_hands(src)
 
 		switch(hit_area)
 			if("head")//Harder to score a stun but if you do it lasts a bit longer
@@ -194,10 +181,23 @@ emp_act
 					visible_message("\red <B>[src] has been knocked down!</B>")
 
 				if(bloody)
+					bloody_body(src)
 
-					if(wear_suit)
-						wear_suit.add_blood(src)
-						update_inv_wear_suit(0)
-					if(w_uniform)
-						w_uniform.add_blood(src)
-						update_inv_w_uniform(0)
+/mob/living/carbon/human/proc/bloody_hands(var/mob/living/source, var/amount = 2)
+	if (gloves)
+		gloves.add_blood(source)
+		gloves:transfer_blood = amount
+		gloves:bloody_hands_mob = source
+	else
+		add_blood(source)
+		bloody_hands = amount
+		bloody_hands_mob = source
+	update_inv_gloves()		//updates on-mob overlays for bloody hands and/or bloody gloves
+
+/mob/living/carbon/human/proc/bloody_body(var/mob/living/source)
+	if(wear_suit)
+		wear_suit.add_blood(source)
+		update_inv_wear_suit(0)
+	if(w_uniform)
+		w_uniform.add_blood(source)
+		update_inv_w_uniform(0)

code/modules/mob/living/say.dm

@@ -1,4 +1,4 @@
-
+#define SAY_MINIMUM_PRESSURE 10
 var/list/department_radio_keys = list(
 	  ":r" = "right hand",
 	  ":l" = "left hand",
@@ -295,6 +295,13 @@ var/list/department_radio_keys = list(
 				italics = 1
 /////SPECIAL HEADSETS END
 
+	var/datum/gas_mixture/environment = loc.return_air()
+	if(environment)
+		var/pressure = environment.return_pressure()
+		if (pressure < SAY_MINIMUM_PRESSURE)	//in space no one can hear you scream
+			italics = 1
+			message_range = 1
+
 	var/list/listening
 
 	listening = get_mobs_in_view(message_range, src)

code/modules/reagents/reagent_containers/food/drinks/bottle.dm

@@ -241,6 +241,14 @@
 		..()
 		reagents.add_reagent("wine", 100)
 
+/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe
+	name = "Jailbreaker Verte"
+	desc = "Twenty-fourth century Green Fairy, one sip of this and you just know you're gonna have a good time."
+	icon_state = "absinthebottle"
+	New()
+		..()
+		reagents.add_reagent("absinthe", 100)
+
 //////////////////////////JUICES AND STUFF ///////////////////////
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice

code/modules/reagents/reagent_containers/pill.dm

@@ -181,3 +181,22 @@
 	New()
 		..()
 		reagents.add_reagent("bicaridine", 30)
+
+/obj/item/weapon/reagent_containers/pill/happy
+	name = "Happy pill"
+	desc = "Happy happy joy joy!"
+	icon_state = "pill18"
+	New()
+		..()
+		reagents.add_reagent("space_drugs", 15)
+		reagents.add_reagent("sugar", 15)
+
+/obj/item/weapon/reagent_containers/pill/zoom
+	name = "Zoom pill"
+	desc = "Zoooom!"
+	icon_state = "pill18"
+	New()
+		..()
+		reagents.add_reagent("impedrezene", 10)
+		reagents.add_reagent("synaptizine", 5)
+		reagents.add_reagent("hyperzine", 5)