Merge pull request #3 from ParadiseSS13/master

merge

code/modules/mob/living/simple_animal/bot/mulebot.dm

@@ -706,10 +706,14 @@
 	H.apply_damage(0.5*damage, BRUTE, "r_arm", run_armor_check("r_arm", "melee"))
 
 
-	var/turf/T = get_turf(src)
-	H.add_mob_blood(H)
-	H.add_splatter_floor(T)
 
+
+	if(NO_BLOOD in H.dna.species.species_traits)//Does the run over mob have blood?
+		return//If it doesn't it shouldn't bleed (Though a check should be made eventually for things with liquid in them, like slime people, vox armalis, etc.)
+
+	var/turf/T = get_turf(src)//Where are we?
+	H.add_mob_blood(H)//Cover the victim in their own blood.
+	H.add_splatter_floor(T)//Put the blood where we are.
 	bloodiness += 4
 
 	var/list/blood_dna = H.get_blood_dna_list()

html/changelog.html

@@ -56,6 +56,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">24 September 2018</h2>
+			<h3 class="author">Triiodine, Desolate, updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Things without blood bleeding red when rolled over by a mulebot.</li>
+			</ul>
+
 			<h2 class="date">19 September 2018</h2>
 			<h3 class="author">Birdtalon updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -6982,3 +6982,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2018-09-19:
   Birdtalon:
   - bugfix: Screwdrivers now open fire alarms instead of wirecutters.
+2018-09-24:
+  Triiodine, Desolate,:
+  - bugfix: Things without blood bleeding red when rolled over by a mulebot.