Merge pull request #10234 from Baystation12/dev-freeze

Dev freeze -> Dev

code/game/machinery/atmoalter/canister.dm

@@ -351,7 +351,7 @@ update_flag
 				"\[N2O\]" = "redws", \
 				"\[N2\]" = "red", \
 				"\[O2\]" = "blue", \
-				"\[Toxin (Bio)\]" = "orange", \
+				"\[Phoron\]" = "orange", \
 				"\[CO2\]" = "black", \
 				"\[Air\]" = "grey", \
 				"\[CAUTION\]" = "yellow", \

code/modules/mob/living/living.dm

@@ -520,6 +520,9 @@ default behaviour is:
 						var/atom/movable/t = M.pulling
 						M.stop_pulling()
 
+						if(!istype(M.loc, /turf/space))
+							var/area/A = get_area(M)
+							if(A.has_gravity)
 								//this is the gay blood on floor shit -- Added back -- Skie
 								if (M.lying && (prob(M.getBruteLoss() / 6)))
 									var/turf/location = M.loc
@@ -537,10 +540,10 @@ default behaviour is:
 										if (istype(location, /turf/simulated))
 											location.add_blood(M)
 											if(ishuman(M))
-										var/mob/living/carbon/H = M
-										var/blood_volume = round(H:vessel.get_reagent_amount("blood"))
+												var/mob/living/carbon/human/H = M
+												var/blood_volume = round(H.vessel.get_reagent_amount("blood"))
 												if(blood_volume > 0)
-											H:vessel.remove_reagent("blood",1)
+													H.vessel.remove_reagent("blood", 1)
 
 
 						step(pulling, get_dir(pulling.loc, T))

code/modules/research/xenoarchaeology/tools/bunsen_burner.dm

@@ -25,6 +25,9 @@
 	else
 		user << "\red You can't put the [W] onto the [src]."
         
+/obj/machinery/bunsen_burner/attack_ai()
+    return
+
 /obj/machinery/bunsen_burner/attack_hand(mob/user as mob)
 	if(held_container)
 		underlays = null