Revert "12/21 modernizations from TG live"

code/modules/projectiles/projectile/magic.dm

@@ -24,46 +24,27 @@
 	damage_type = BRUTE
 	nodamage = 0
 
-	//explosion values
-	var/exp_heavy = 0
-	var/exp_light = 2
-	var/exp_flash = 3
-	var/exp_fire = 2
-
 /obj/item/projectile/magic/fireball/Range()
 	var/turf/T1 = get_step(src,turn(dir, -45))
 	var/turf/T2 = get_step(src,turn(dir, 45))
-	var/turf/T3 = get_step(src,dir)
 	var/mob/living/L = locate(/mob/living) in T1 //if there's a mob alive in our front right diagonal, we hit it.
 	if(L && L.stat != DEAD)
-		Bump(L,1) //Magic Bullet #teachthecontroversy
+		Bump(L) //Magic Bullet #teachthecontroversy
 		return
 	L = locate(/mob/living) in T2
 	if(L && L.stat != DEAD)
-		Bump(L,1)
-		return
-	L = locate(/mob/living) in T3
-	if(L && L.stat != DEAD)
-		Bump(L,1)
+		Bump(L)
 		return
 	..()
 
 /obj/item/projectile/magic/fireball/on_hit(target)
 	. = ..()
 	var/turf/T = get_turf(target)
-	explosion(T, -1, exp_heavy, exp_light, exp_flash, 0, flame_range = exp_fire)
+	explosion(T, -1, 0, 2, 3, 0, flame_range = 2)
 	if(ismob(target)) //multiple flavors of pain
 		var/mob/living/M = target
 		M.take_overall_damage(0,10) //between this 10 burn, the 10 brute, the explosion brute, and the onfire burn, your at about 65 damage if you stop drop and roll immediately
 
-/obj/item/projectile/magic/fireball/infernal
-	name = "infernal fireball"
-	exp_heavy = -1
-	exp_light = -1
-	exp_flash = 4
-	exp_fire= 5
-
-
 /obj/item/projectile/magic/resurrection
 	name = "bolt of resurrection"
 	icon_state = "ion"
@@ -126,7 +107,7 @@
 		OpenDoor(target)
 	else
 		var/turf/T = get_turf(target)
-		if(isclosedturf(T) && !istype(T, /turf/closed/indestructible))
+		if(istype(T,/turf/closed) && !istype(T, /turf/closed/indestructible))
 			CreateDoor(T)
 
 /obj/item/projectile/magic/door/proc/CreateDoor(turf/T)
@@ -151,7 +132,6 @@
 /obj/item/projectile/magic/change/on_hit(atom/change)
 	. = ..()
 	wabbajack(change)
-	qdel(src)
 
 /proc/wabbajack(mob/living/M)
 	if(!istype(M) || M.stat == DEAD || M.notransform || (GODMODE & M.status_flags))
@@ -165,7 +145,7 @@
 
 	var/list/contents = M.contents.Copy()
 
-	if(iscyborg(M))
+	if(istype(M, /mob/living/silicon/robot))
 		var/mob/living/silicon/robot/Robot = M
 		if(Robot.mmi)
 			qdel(Robot.mmi)
@@ -212,7 +192,7 @@
 		if("animal")
 			var/path
 			if(prob(50))
-				var/beast = pick("carp","bear","mushroom","statue", "bat", "goat","killertomato", "spiderbase", "spiderhunter", "blobbernaut", "magicarp", "chaosmagicarp", "watcher", "goliath", "headcrab", "morph", "stickman", "stickdog", "lesserdragon")
+				var/beast = pick("carp","bear","mushroom","statue", "bat", "goat","killertomato", "spiderbase", "spiderhunter", "blobbernaut", "magicarp", "chaosmagicarp")
 				switch(beast)
 					if("carp")
 						path = /mob/living/simple_animal/hostile/carp
@@ -238,20 +218,6 @@
 						path = /mob/living/simple_animal/hostile/carp/ranged
 					if("chaosmagicarp")
 						path = /mob/living/simple_animal/hostile/carp/ranged/chaos
-					if("watcher")
-						path = /mob/living/simple_animal/hostile/asteroid/basilisk/watcher
-					if("goliath")
-						path = /mob/living/simple_animal/hostile/asteroid/goliath/beast
-					if("headcrab")
-						path = /mob/living/simple_animal/hostile/headcrab
-					if("morph")
-						path = /mob/living/simple_animal/hostile/morph
-					if("stickman")
-						path = /mob/living/simple_animal/hostile/stickman
-					if("stickdog")
-						path = /mob/living/simple_animal/hostile/stickman/dog
-					if("lesserdragon")
-						path = /mob/living/simple_animal/hostile/megafauna/dragon/lesser
 			else
 				var/animal = pick("parrot","corgi","crab","pug","cat","mouse","chicken","cow","lizard","chick","fox","butterfly","cak")
 				switch(animal)
@@ -316,7 +282,7 @@
 
 	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>[M.real_name] ([M.ckey]) became [new_mob.real_name].</font>")
 
-	new_mob.a_intent = INTENT_HARM
+	new_mob.a_intent = "harm"
 
 	M.wabbajack_act(new_mob)
 
@@ -333,53 +299,34 @@
 	damage_type = BURN
 	nodamage = 1
 
-/obj/item/projectile/magic/animate/on_hit(atom/target, blocked = 0)
+/obj/item/projectile/magic/animate/Bump(atom/change)
 	..()
-	if((istype(target, /obj/item) || istype(target, /obj/structure)) && !is_type_in_list(target, protected_objects))
-		if(istype(target, /obj/structure/statue/petrified))
-			var/obj/structure/statue/petrified/P = target
-			if(P.petrified_mob)
-				var/mob/living/L = P.petrified_mob
-				var/mob/living/simple_animal/hostile/statue/S = new (P.loc, firer)
-				S.name = "statue of [L.name]"
+	if(istype(change, /obj/item) || istype(change, /obj/structure) && !is_type_in_list(change, protected_objects))
+		if(istype(change, /obj/structure/closet/statue))
+			for(var/mob/living/carbon/human/H in change.contents)
+				var/mob/living/simple_animal/hostile/statue/S = new /mob/living/simple_animal/hostile/statue(change.loc, firer)
+				S.name = "statue of [H.name]"
 				S.faction = list("\ref[firer]")
-				S.icon = P.icon
-				S.icon_state = P.icon_state
-				S.overlays = P.overlays
-				S.color = P.color
-				S.atom_colours = P.atom_colours.Copy()
-				if(L.mind)
-					L.mind.transfer_to(S)
+				S.icon = change.icon
+				S.icon_state = change.icon_state
+				S.overlays = change.overlays
+				S.color = change.color
+				if(H.mind)
+					H.mind.transfer_to(S)
 					S << "<span class='userdanger'>You are an animate statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved! Do not harm [firer.name], your creator.</span>"
-				P.loc = S
+				H = change
+				H.loc = S
 				qdel(src)
 				return
 		else
-			var/obj/O = target
+			var/obj/O = change
 			if(istype(O, /obj/item/weapon/gun))
 				new /mob/living/simple_animal/hostile/mimic/copy/ranged(O.loc, O, firer)
 			else
 				new /mob/living/simple_animal/hostile/mimic/copy(O.loc, O, firer)
 
-	else if(istype(target, /mob/living/simple_animal/hostile/mimic/copy))
+	else if(istype(change, /mob/living/simple_animal/hostile/mimic/copy))
 		// Change our allegiance!
-		var/mob/living/simple_animal/hostile/mimic/copy/C = target
+		var/mob/living/simple_animal/hostile/mimic/copy/C = change
 		C.ChangeOwner(firer)
 
-/obj/item/projectile/magic/spellblade
-	name = "blade energy"
-	icon_state = "lavastaff"
-	damage = 15
-	damage_type = BURN
-	flag = "magic"
-	dismemberment = 50
-	nodamage = 0
-
-/obj/item/projectile/magic/arcane_barrage
-	name = "arcane bolt"
-	icon_state = "arcane_barrage"
-	damage = 20
-	damage_type = BURN
-	nodamage = 0
-	armour_penetration = 0
-	flag = "magic"