Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

Conflicts:
	code/modules/supermatter/supermatter.dm
	maps/tgstation2.dmm

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -153,7 +153,7 @@
 	playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
 	add_fingerprint(user)
 
-	if(blood_overlay && (blood_DNA.len >= 1))							//updates blood overlay, if any
+	if(blood_overlay && (blood_DNA.len >= 1)) //updates blood overlay, if any
 		overlays.Cut()//this might delete other item overlays as well but eeeeeeeh
 
 		var/icon/I = new /icon(src.icon, src.icon_state)
@@ -176,12 +176,10 @@
 			else
 				user.take_organ_damage(2*force)
 			return
-
-		if(!..()) return
-		playsound(src.loc, "swing_hit", 50, 1, -1)
-		//target.Stun(4)	//naaah
-		target.Weaken(4)
-		return
+		if(..())
+			playsound(src.loc, "swing_hit", 50, 1, -1)
+			target.Weaken(4)
+			return
 	else
 		return ..()
 
@@ -216,8 +214,6 @@
 /*
  * Energy Axe
  */
-/obj/item/weapon/melee/energy/axe/attack(target as mob, mob/user as mob)
-	..()
 
 /obj/item/weapon/melee/energy/axe/attack_self(mob/user as mob)
 	src.active = !( src.active )

code/game/objects/items/weapons/tools.dm

@@ -372,18 +372,21 @@
 				usr << "\red Your thermals intensify the welder's glow. Your eyes itch and burn severely."
 				user.eye_blurry += rand(12,20)
 				E.damage += rand(12, 16)
-		if(E.damage > 10 && safety < 2)
-			user << "\red Your eyes are really starting to hurt. This can't be good for you!"
-		if (E.damage >= E.min_broken_damage)
-			user << "\red You go blind!"
-			user.sdisabilities |= BLIND
-		else if (E.damage >= E.min_bruised_damage)
-			user << "\red You go blind!"
-			user.eye_blind = 5
-			user.eye_blurry = 5
-			user.disabilities |= NEARSIGHTED
-			spawn(100)
-				user.disabilities &= ~NEARSIGHTED
+		if(safety<2)
+
+			if(E.damage > 10)
+				user << "\red Your eyes are really starting to hurt. This can't be good for you!"
+
+			if (E.damage >= E.min_broken_damage)
+				user << "\red You go blind!"
+				user.sdisabilities |= BLIND
+			else if (E.damage >= E.min_bruised_damage)
+				user << "\red You go blind!"
+				user.eye_blind = 5
+				user.eye_blurry = 5
+				user.disabilities |= NEARSIGHTED
+				spawn(100)
+					user.disabilities &= ~NEARSIGHTED
 	return