Merge pull request #12939 from KorPhaeron/really_bad_ideas

Adds a series of ridiculous weapons to the wizard spellbook

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

@@ -71,14 +71,14 @@
 
 
 /obj/item/weapon/twohanded/mjollnir
-	name = "Mjollnir"
+	name = "Mjolnir"
 	desc = "A weapon worthy of a god, able to strike with the force of a lightning bolt. It crackles with barely contained energy."
 	icon_state = "mjollnir0"
 	flags = CONDUCT
 	slot_flags = SLOT_BACK
 	force = 5
 	force_unwielded = 5
-	force_wielded = 20
+	force_wielded = 25
 	throwforce = 30
 	throw_range = 7
 	w_class = 5
@@ -89,7 +89,6 @@
 	var/datum/effect_system/lightning_spread/s = new /datum/effect_system/lightning_spread
 	s.set_up(5, 1, target.loc)
 	s.start()
-	target.take_organ_damage(0,30)
 	target.visible_message("<span class='danger'>[target.name] was shocked by the [src.name]!</span>", \
 		"<span class='userdanger'>You feel a powerful shock course through your body sending you flying!</span>", \
 		"<span class='italics'>You hear a heavy electrical crack!</span>")
@@ -106,9 +105,15 @@
 		//charged = 0
 		playsound(src.loc, "sparks", 50, 1)
 		if(istype(M, /mob/living))
-			M.Stun(10)
+			M.Stun(3)
 			shock(M)
 
+/obj/item/weapon/twohanded/mjollnir/throw_impact(atom/target)
+	. = ..()
+	if(istype(target, /mob/living))
+		var/mob/living/L = target
+		L.Stun(3)
+		shock(L)
 
 /obj/item/weapon/twohanded/mjollnir/update_icon()  //Currently only here to fuck with the on-mob icons.
 	icon_state = "mjollnir[wielded]"