Revert "Merge branch 'master' into Yeehaw"

This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.

code/modules/spells/spell_types/conjure.dm

@@ -31,7 +31,7 @@
 		if(ispath(summoned_object_type, /turf))
 			var/turf/O = spawn_place
 			var/N = summoned_object_type
-			O.ChangeTurf(N, flags = CHANGETURF_INHERIT_AIR)
+			O.ChangeTurf(N)
 		else
 			var/atom/summoned_object = new summoned_object_type(spawn_place)
 

code/modules/spells/spell_types/devil.dm

@@ -234,7 +234,7 @@
 		dancefloor_exists = FALSE
 		for(var/i in 1 to dancefloor_turfs.len)
 			var/turf/T = dancefloor_turfs[i]
-			T.ChangeTurf(dancefloor_turfs_types[i], flags = CHANGETURF_INHERIT_AIR)
+			T.ChangeTurf(dancefloor_turfs_types[i])
 	else
 		var/list/funky_turfs = RANGE_TURFS(1, user)
 		for(var/turf/closed/solid in funky_turfs)
@@ -248,7 +248,7 @@
 			var/turf/T = t
 			dancefloor_turfs[i] = T
 			dancefloor_turfs_types[i] = T.type
-			T.ChangeTurf((i % 2 == 0) ? /turf/open/floor/light/colour_cycle/dancefloor_a : /turf/open/floor/light/colour_cycle/dancefloor_b, flags = CHANGETURF_INHERIT_AIR)
+			T.ChangeTurf((i % 2 == 0) ? /turf/open/floor/light/colour_cycle/dancefloor_a : /turf/open/floor/light/colour_cycle/dancefloor_b)
 			i++
 
 /datum/effect_system/smoke_spread/transparent/dancefloor_devil

code/modules/spells/spell_types/godhand.dm

@@ -216,4 +216,4 @@
 	P.original = user
 	P.firer = user
 	P.fire()
-	return ..()
+	return ..()

code/modules/spells/spell_types/touch_attacks.dm

@@ -78,8 +78,8 @@
 	hand_path = /obj/item/melee/touch_attack/nuclearfist
 
 	school = "evocation"
-	charge_max = 100
+	charge_max = 200
 	clothes_req = 0
-	cooldown_min = 20
+	cooldown_min = 40
 
-	action_icon_state = "nuclearfist"
+	action_icon_state = "nuclearfist"