Merge pull request #10233 from Baystation12/master

Master -> Dev-freeze.

code/game/machinery/atmoalter/canister.dm

@@ -356,7 +356,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

@@ -521,27 +521,30 @@ default behaviour is:
 						var/atom/movable/t = M.pulling
 						M.stop_pulling()
 
-						//this is the gay blood on floor shit -- Added back -- Skie
+						if(!istype(M.loc, /turf/space))
-						if (M.lying && (prob(M.getBruteLoss() / 6)))
+							var/area/A = get_area(M)
-							var/turf/location = M.loc
+							if(A.has_gravity)
-							if (istype(location, /turf/simulated))
+								//this is the gay blood on floor shit -- Added back -- Skie
-								location.add_blood(M)
+								if (M.lying && (prob(M.getBruteLoss() / 6)))
-						//pull damage with injured people
+									var/turf/location = M.loc
-							if(prob(25))
+									if (istype(location, /turf/simulated))
-								M.adjustBruteLoss(1)
+										location.add_blood(M)
-								visible_message("<span class='danger'>\The [M]'s [M.isSynthetic() ? "state worsens": "wounds open more"] from being dragged!</span>")
+								//pull damage with injured people
-						if(M.pull_damage())
+									if(prob(25))
-							if(prob(25))
+										M.adjustBruteLoss(1)
-								M.adjustBruteLoss(2)
+										visible_message("<span class='danger'>\The [M]'s [M.isSynthetic() ? "state worsens": "wounds open more"] from being dragged!</span>")
-								visible_message("<span class='danger'>\The [M]'s [M.isSynthetic() ? "state" : "wounds"] worsen terribly from being dragged!</span>")
+								if(M.pull_damage())
-								var/turf/location = M.loc
+									if(prob(25))
-								if (istype(location, /turf/simulated))
+										M.adjustBruteLoss(2)
-									location.add_blood(M)
+										visible_message("<span class='danger'>\The [M]'s [M.isSynthetic() ? "state" : "wounds"] worsen terribly from being dragged!</span>")
-									if(ishuman(M))
+										var/turf/location = M.loc
-										var/mob/living/carbon/H = M
+										if (istype(location, /turf/simulated))
-										var/blood_volume = round(H:vessel.get_reagent_amount("blood"))
+											location.add_blood(M)
-										if(blood_volume > 0)
+											if(ishuman(M))
-											H:vessel.remove_reagent("blood",1)
+												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)
 
 
 						step(pulling, get_dir(pulling.loc, T))

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

@@ -24,6 +24,9 @@
 					try_heating()
 	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)