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

code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm

@@ -96,7 +96,7 @@
 		if(istype(A, /mob/living))
 			var/mob/living/L = A
 			L.visible_message("<span class ='danger'>[src] pounces on [L]!</span>", "<span class ='userdanger'>[src] pounces on you!</span>")
-			L.Weaken(5)
+			apply_effect(5, WEAKEN, run_armor_check("chest", "melee"))
 			sleep(2)//Runtime prevention (infinite bump() calls on hulks)
 			step_towards(src,L)
 

code/modules/mob/living/carbon/human/human_attackalien.dm

@@ -34,8 +34,9 @@
 			M.do_attack_animation(src)
 			var/randn = rand(1, 100)
 			if (randn <= 80)
+				var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))
 				playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
-				Weaken(5)
+				apply_effect(5, WEAKEN, run_armor_check(affecting, "melee"))
 				for(var/mob/O in viewers(src, null))
 					if ((O.client && !( O.blinded )))
 						O.show_message(text("\red <B>[] has tackled down []!</B>", M, src), 1)

code/modules/mob/living/carbon/human/human_defense.dm

@@ -77,7 +77,7 @@ emp_act
 /mob/living/carbon/human/proc/getarmor_organ(var/obj/item/organ/external/def_zone, var/type)
 	if(!type || !def_zone)	return 0
 	var/protection = 0
-	var/list/body_parts = list(head, wear_mask, wear_suit, w_uniform)
+	var/list/body_parts = list(head, wear_mask, wear_suit, w_uniform, back, gloves, shoes, belt, s_store, glasses, l_ear, r_ear, wear_id) //Everything but pockets. Pockets are l_store and r_store. (if pockets were allowed, putting something armored, gloves or hats for example, would double up on the armor)
 	for(var/bp in body_parts)
 		if(!bp)	continue
 		if(bp && istype(bp ,/obj/item/clothing))

code/modules/mob/living/carbon/human/npcs.dm

@@ -10,4 +10,4 @@
 	spawn(1)
 		name = "Pun Pun"
 		real_name = name
-		w_uniform = new /obj/item/clothing/under/punpun(src)
+		equip_to_slot(new /obj/item/clothing/under/punpun(src), slot_w_uniform)

code/modules/mob/living/silicon/robot/drone/drone_console.dm

@@ -4,7 +4,7 @@
 	icon_screen = "power"
 	icon_keyboard = "power_key"
 	req_access = list(access_engine_equip)
-	circuit = "/obj/item/weapon/circuitboard/drone_control"
+	circuit = /obj/item/weapon/circuitboard/drone_control
 
 	//Used when pinging drones.
 	var/drone_call_area = "Engineering"

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -471,6 +471,7 @@
 	src.modules += new /obj/item/weapon/matter_decompiler(src)
 	src.modules += new /obj/item/weapon/reagent_containers/spray/cleaner/drone(src)
 	src.modules += new /obj/item/weapon/soap(src)
+	src.modules += new /obj/item/device/t_scanner(src)
 
 	src.emag = new /obj/item/weapon/pickaxe/drill/cyborg/diamond(src)
 
@@ -499,4 +500,4 @@
 
 	var/mob/living/silicon/robot/R = src.loc
 
-	return (src in R.module.modules)
+	return (src in R.module.modules)

code/modules/mob/living/simple_animal/bot_swarm/swarmer.dm

@@ -227,6 +227,9 @@
 /obj/item/stack/cable_coil/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)//Wiring would be too effective as a resource
 	S << "<span class='warning'>This object does not contain enough materials to work with.</span>"
 
+/obj/item/weapon/circuitboard/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
+	S << "<span class='warning'>This object does not contain enough materials to work with.</span>"
+
 /obj/machinery/porta_turret/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
 	S << "<span class='warning'>Attempting to dismantle this machine would result in an immediate counterattack. Aborting.</span>"
 
@@ -323,8 +326,7 @@
 		if(istype(target, /obj/machinery/computer))
 			var/obj/machinery/computer/C = target
 			if(C.circuit)
-				var/obj/item/weapon/circuitboard/circuit = text2path(C.circuit)
-				new circuit(get_turf(M))
+				new C.circuit(get_turf(M))
 		qdel(target)