Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur

Conflicts:
	code/game/objects/structures/grille.dm
	icons/effects/beam.dmi

code/game/objects/structures/grille.dm

@@ -271,9 +271,9 @@
 						if(dist <= 3)
 							closest_mob = A
 				if(closest_mob)
-					var/shock_damage = C.powernet.avail * 0.08
+					var/shock_damage = C.powernet.avail * 0.0002//setting shock damage for later. equals 1/5000 the power in the grid
 					src.Beam(closest_mob, icon_state="lightning[rand(1,12)]", time=5)
-					closest_mob.electrocute_act(shock_damage, src, 1, tesla_shock = 1)//ZAP for 1/5000 of the amount of power, which is from 15-25 with 200000W
+					closest_mob.electrocute_act(shock_damage, src, 1)//ZAP, damage should be about 40 with 200000W
 					playsound(src.loc, 'sound/magic/LightningShock.ogg', 100, 1, extrarange = 5)
 	take_damage(tforce)
 

code/game/objects/structures/guncase.dm

@@ -80,10 +80,8 @@
 		if(!usr.canUseTopic(src))
 			return
 		if(ishuman(usr))
-			if(!usr.get_active_hand())
-				usr.put_in_hands(O)
-			else
-				O.loc = get_turf(src)
+			if(!usr.put_in_hands(O))
+				O.forceMove(get_turf(src))
 			update_icon()
 
 /obj/structure/guncase/shotgun

code/game/objects/structures/morgue.dm

@@ -66,7 +66,7 @@
 	add_fingerprint(user)
 	if(istype(P, /obj/item/weapon/pen))
 		var/t = stripped_input(user, "What would you like the label to be?", text("[]", name), null)
-		if (user.get_active_hand() != P)
+		if (user.get_active_held_item() != P)
 			return
 		if ((!in_range(src, usr) && src.loc != user))
 			return

code/game/objects/structures/noticeboard.dm

@@ -60,15 +60,12 @@
 		var/obj/item/P = locate(href_list["write"])
 
 		if((P && P.loc == src)) //ifthe paper's on the board
-			if(istype(usr.r_hand, /obj/item/weapon/pen)) //and you're holding a pen
+			var/obj/item/I = usr.is_holding_item_of_type(/obj/item/weapon/pen)
+			if(I) //check hand for pen
 				add_fingerprint(usr)
-				P.attackby(usr.r_hand, usr) //then do ittttt
+				P.attackby(I, usr)
 			else
-				if(istype(usr.l_hand, /obj/item/weapon/pen)) //check other hand for pen
-					add_fingerprint(usr)
-					P.attackby(usr.l_hand, usr)
-				else
-					usr << "<span class='notice'>You'll need something to write with!</span>"
+				usr << "<span class='notice'>You'll need something to write with!</span>"
 
 	if(href_list["read"])
 		var/obj/item/weapon/paper/P = locate(href_list["read"])

code/game/objects/structures/safe.dm

@@ -91,7 +91,7 @@ FLOOR SAFES
 	var/mob/living/carbon/human/user = usr
 
 	var/canhear = 0
-	if(istype(user.l_hand, /obj/item/clothing/tie/stethoscope) || istype(user.r_hand, /obj/item/clothing/tie/stethoscope))
+	if(user.is_holding_item_of_type(/obj/item/clothing/tie/stethoscope))
 		canhear = 1
 
 	if(href_list["open"])

code/game/objects/structures/tables_racks.dm

@@ -502,7 +502,7 @@
 		. = . || mover.checkpass(PASSTABLE)
 
 /obj/structure/rack/MouseDrop_T(obj/O, mob/user)
-	if ((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O))
+	if ((!( istype(O, /obj/item/weapon) ) || user.get_active_held_item() != O))
 		return
 	if(!user.drop_item())
 		return

code/game/objects/structures/target_stake.dm

@@ -41,7 +41,7 @@
 	pinned_target.nullPinnedLoc()
 	nullPinnedTarget()
 	if(ishuman(user))
-		if(!user.get_active_hand())
+		if(!user.get_active_held_item())
 			user.put_in_hands(pinned_target)
 			user << "<span class='notice'>You take the target out of the stake.</span>"
 	else

code/game/objects/structures/watercloset.dm

@@ -294,10 +294,8 @@
 		var/mob/living/carbon/M = L
 		. = 1
 		check_heat(M)
-		if(M.r_hand)
-			M.r_hand.clean_blood()
-		if(M.l_hand)
-			M.l_hand.clean_blood()
+		for(var/obj/item/I in M.held_items)
+			I.clean_blood()
 		if(M.back)
 			if(M.back.clean_blood())
 				M.update_inv_back(0)