Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258

2019-10-24 09:50:20 +02:00
parent 6c34a51ff4 7011533bb7
commit 4c8d7023c5
134 changed files with 2374 additions and 1101 deletions
@@ -410,7 +410,7 @@ SLIME SCANNER
 					msg += "<span class='danger'>Subject is bleeding!</span>\n"
 			var/blood_percent =  round((C.blood_volume / (BLOOD_VOLUME_NORMAL * C.blood_ratio))*100)
 			var/blood_type = C.dna.blood_type
-			if(blood_id != "blood")//special blood substance
+			if(blood_id != ("blood" || "jellyblood"))//special blood substance
 				var/datum/reagent/R = GLOB.chemical_reagents_list[blood_id]
 				if(R)
 					blood_type = R.name