Merge remote-tracking branch 'upstream/master' into hit-reactions

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

@@ -74,7 +74,7 @@
 		to_chat(user, "<span class='notice'>You dedicate your module to [name].</span>")
 	else
 		to_chat(user, "<span class='notice'>You grab the [name] with both hands.</span>")
-	if (wieldsound)
+	if(wieldsound)
 		playsound(loc, wieldsound, 50, 1)
 	var/obj/item/weapon/twohanded/offhand/O = new(user) ////Let's reserve his other hand~
 	O.name = "[name] - offhand"
@@ -570,7 +570,7 @@
 				Z.ex_act(2)
 				charged = 3
 				playsound(user, 'sound/weapons/marauder.ogg', 50, 1)
-			else if (istype(A, /obj/structure) || istype(A, /obj/mecha/))
+			else if(istype(A, /obj/structure) || istype(A, /obj/mecha/))
 				var/obj/Z = A
 				Z.ex_act(2)
 				charged = 3