Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/silicon/pai/life.dm

code/_onclick/click.dm

@@ -38,7 +38,7 @@
 		return
 	next_click = world.time + 1
 
-	if(client.buildmode)
+	if(client && client.buildmode)
 		build_click(src, client.buildmode, params, A)
 		return
 
@@ -411,7 +411,7 @@
 /*	if(buckled && buckled.movable)
 		buckled.dir = direction
 		buckled.handle_rotation()*/
-		
+
 /obj/screen/click_catcher
 	icon = 'icons/mob/screen1_full.dmi'
 	icon_state = "passage0"

code/_onclick/hud/hud.dm

@@ -199,6 +199,8 @@ datum/hud/New(mob/owner)
 	else if(mymob.mind && mymob.mind.vampire)
 		vampire_hud()
 		human_hud('icons/mob/screen1_Vampire.dmi')
+	else if(isswarmer(mymob))
+		swarmer_hud()
 
 //Triggered when F12 is pressed (Unless someone changed something in the DMF)
 /mob/verb/button_pressed_F12(var/full = 0 as null)

code/_onclick/item_attack.dm

@@ -158,9 +158,9 @@
 
 					M.take_organ_damage(power)
 					if (prob(33)) // Added blood for whacking non-humans too
-						var/turf/location = M.loc
+						var/turf/simulated/location = M.loc
 						if (istype(location, /turf/simulated))
-							location:add_blood_floor(M)
+							location.add_blood_floor(M)
 			if("fire")
 				if (!(RESIST_COLD in M.mutations))
 					M.take_organ_damage(0, power)