Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2

Conflicts:
	.travis.yml
	polaris.dme

code/datums/ai_laws.dm

@@ -198,9 +198,7 @@ var/global/const/base_law_type = /datum/ai_laws/nanotrasen
 	var/index = laws.Find(law)
 	if(index)
 		laws -= law
-		world << state.len
 		for(index, index < state.len, index++)
-			world << index
 			state[index] = state[index+1]
 	sorted_laws.Cut()
 

code/datums/diseases/alien_embryo.dm

@@ -66,7 +66,7 @@
 				if(prob(20))
 					affected_mob.take_organ_damage(1)
 			if(prob(2))
-				affected_mob << "<span class='warning>Your stomach hurts.</span>"
+				affected_mob << "<span class='warning'>Your stomach hurts.</span>"
 				if(prob(20))
 					affected_mob.adjustToxLoss(1)
 					affected_mob.updatehealth()

code/datums/diseases/brainrot.dm

@@ -49,7 +49,7 @@
 				affected_mob.adjustToxLoss(4)
 				affected_mob.updatehealth()
 				if(prob(2))
-					affected_mob << "<span class='notice>Your head hurts.</span>" */
+					affected_mob << "<span class='notice'>Your head hurts.</span>" */
 			if(prob(15) && affected_mob.getBrainLoss()<=98) //shouldn't retard you to death now
 				affected_mob.adjustBrainLoss(3)
 				affected_mob.updatehealth()

code/datums/diseases/cold9.dm

@@ -16,7 +16,7 @@
 		if(2)
 			affected_mob.bodytemperature -= 10
 			if(prob(1) && prob(10))
-				affected_mob << "<span class='notice>You feel better.</span>"
+				affected_mob << "<span class='notice'>You feel better.</span>"
 				cure()
 				return
 			if(prob(1))

code/datums/helper_datums/teleport.dm

@@ -159,7 +159,7 @@
 		precision = max(rand(1,100)*bagholding.len,100)
 		if(istype(teleatom, /mob/living))
 			var/mob/living/MM = teleatom
-			MM << "<span class='danger>The Bluespace interface on your [teleatom] interferes with the teleport!</span>"
+			MM << "<span class='danger'>The Bluespace interface on your [teleatom] interferes with the teleport!</span>"
 	return 1
 
 /datum/teleport/instant/science/teleportChecks()

code/datums/supplypacks.dm

@@ -22,9 +22,11 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 
 /datum/supply_packs/New()
 	manifest += "<ul>"
-	for(var/atom/movable/path in contains)
-		if(!path)	continue
-		manifest += "<li>[initial(path.name)]</li>"
+	for(var/path in contains)
+		if(!path || !ispath(path, /atom))
+			continue
+		var/atom/O = path
+		manifest += "<li>[initial(O.name)]</li>"
 	manifest += "</ul>"
 
 /datum/supply_packs/specialops