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

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

code/modules/power/antimatter/control.dm

@@ -170,12 +170,11 @@
 		if(fueljar)
 			user << "<span class='warning'>There is already a [fueljar] inside!</span>"
 			return
+
+		if(!user.unEquip(W))
+			return
 		fueljar = W
-		W.loc = src
-		if(user.client)
-			user.client.screen -= W
-		user.unEquip(W)
-		user.update_icons()
+		W.forceMove(src)
 		user.visible_message("[user.name] loads an [W.name] into the [src.name].", \
 				"<span class='notice'>You load an [W.name].</span>", \
 				"<span class='italics'>You hear a thunk.</span>")

code/modules/power/cable.dm

@@ -517,7 +517,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \
 		return ..()
 
 	var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected))
-	if(affecting && affecting.status == ORGAN_ROBOTIC)
+	if(affecting && affecting.status == BODYPART_ROBOTIC)
 		user.visible_message("<span class='notice'>[user] starts to fix some of the wires in [H]'s [affecting.name].</span>", "<span class='notice'>You start fixing some of the wires in [H]'s [affecting.name].</span>")
 		if(!do_mob(user, H, 50))
 			return

code/modules/power/lighting.dm

@@ -439,10 +439,9 @@
 		else
 			user << "<span class='warning'>You try to remove the light [fitting], but you burn your hand on it!</span>"
 
-			var/obj/item/bodypart/affecting = H.get_bodypart("[user.hand ? "l" : "r" ]_arm")
+			var/obj/item/bodypart/affecting = H.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm")
 			if(affecting && affecting.take_damage( 0, 5 ))		// 5 burn damage
-				H.update_damage_overlays(0)
-			H.updatehealth()
+				H.update_damage_overlays()
 			return				// if burned, don't remove the light
 	else
 		user << "<span class='notice'>You remove the light [fitting].</span>"

code/modules/power/singularity/singularity.dm

@@ -392,7 +392,7 @@
 
 /obj/singularity/proc/mezzer()
 	for(var/mob/living/carbon/M in oviewers(8, src))
-		if(istype(M, /mob/living/carbon/brain)) //Ignore brains
+		if(istype(M, /mob/living/brain)) //Ignore brains
 			continue
 
 		if(M.stat == CONSCIOUS)