Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

code/modules/spells/spell_types/godhand.dm

@@ -182,3 +182,38 @@
 
 	if(charges <= 0)
 		qdel(src)
+
+/obj/item/melee/touch_attack/nuclearfist
+	name = "\improper PURE MANLINESS"
+	desc = "SHOW THEM RAW POWER"
+	catchphrase = "I CAST FIST!"
+	on_use_sound = 'sound/weapons/nuclear_fist.ogg'
+	icon_state = "disintegrate"
+	item_state = "disintegrate"
+
+/obj/item/melee/touch_attack/nuclearfist/afterattack(atom/movable/target, mob/living/carbon/user, proximity)
+	if(!proximity || target == user || !ismob(target) || !iscarbon(user) || user.lying || user.handcuffed) //exploding after touching yourself would be bad
+		return
+	if(!user.can_speak_vocal())
+		to_chat(user, "<span class='notice'>You can't get the words out!</span>")
+		return
+	var/mob/M = target
+	var/atom/A = M.anti_magic_check()
+	if(A)
+		if(isitem(A))
+			target.visible_message("<span class='warning'>[target]'s [A] glows brightly as it wards off the spell!</span>")
+		user.visible_message("<span class='warning'>The feedback blows [user]'s arm off!</span>","<span class='userdanger'>The spell bounces from [M]'s skin back into your arm!</span>")
+		user.flash_act()
+		var/obj/item/bodypart/part = user.get_holding_bodypart_of_item(src)
+		if(part)
+			part.dismember()
+		return ..()
+	var/angle = dir2angle(get_dir(src, get_step_away(target, src)))
+	var/obj/item/projectile/magic/nuclear/P = new(get_turf(src))
+	P.victim = target
+	target.forceMove(P)
+	P.setAngle(angle)
+	P.original = user
+	P.firer = user
+	P.fire()
+	return ..()

code/modules/spells/spell_types/touch_attacks.dm

@@ -23,7 +23,7 @@
 		remove_hand(TRUE)
 		to_chat(user, "<span class='notice'>You draw the power out of your hand.</span>")
 		return
-	
+
 	for(var/mob/living/carbon/C in targets)
 		if(!attached_hand)
 			if(ChargeHand(C))
@@ -71,3 +71,15 @@
 
 	action_icon_state = "statue"
 	sound = 'sound/magic/fleshtostone.ogg'
+
+/obj/effect/proc_holder/spell/targeted/touch/nuclear_fist
+	name = "Nuclear Fist"
+	desc = "This spell channels raw manliness, allowing you punch your enemies across the galaxy, causing them to detonate violently if hitting any other living being midflight. Does not work while laying down."
+	hand_path = /obj/item/melee/touch_attack/nuclearfist
+
+	school = "evocation"
+	charge_max = 200
+	clothes_req = 0
+	cooldown_min = 40
+
+	action_icon_state = "nuclearfist"