diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index 59e0f8beac..9a8228aaa6 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/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", \
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index ddf9037207..2c19a5a9df 100644
--- a/code/modules/mob/living/living.dm
+++ b/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 (M.lying && (prob(M.getBruteLoss() / 6)))
- var/turf/location = M.loc
- if (istype(location, /turf/simulated))
- location.add_blood(M)
- //pull damage with injured people
- if(prob(25))
- M.adjustBruteLoss(1)
- visible_message("\The [M]'s [M.isSynthetic() ? "state worsens": "wounds open more"] from being dragged!")
- if(M.pull_damage())
- if(prob(25))
- M.adjustBruteLoss(2)
- visible_message("\The [M]'s [M.isSynthetic() ? "state" : "wounds"] worsen terribly from being dragged!")
- var/turf/location = M.loc
- 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"))
- if(blood_volume > 0)
- H:vessel.remove_reagent("blood",1)
+ 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
+ if (istype(location, /turf/simulated))
+ location.add_blood(M)
+ //pull damage with injured people
+ if(prob(25))
+ M.adjustBruteLoss(1)
+ visible_message("\The [M]'s [M.isSynthetic() ? "state worsens": "wounds open more"] from being dragged!")
+ if(M.pull_damage())
+ if(prob(25))
+ M.adjustBruteLoss(2)
+ visible_message("\The [M]'s [M.isSynthetic() ? "state" : "wounds"] worsen terribly from being dragged!")
+ var/turf/location = M.loc
+ if (istype(location, /turf/simulated))
+ location.add_blood(M)
+ if(ishuman(M))
+ 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))
diff --git a/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm b/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm
index 5a74061a23..ce2a982d10 100644
--- a/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm
+++ b/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)