Magic Overhaul Part Deux

code/modules/admin/secrets.dm

@@ -117,6 +117,8 @@
 					<A href='?src=\ref[src];secretsfun=fakeguns'>Make all items look like guns</A><BR>
 					<A href='?src=\ref[src];secretsfun=schoolgirl'>Japanese Animes Mode</A><BR>
 					<A href='?src=\ref[src];secretsfun=eagles'>Egalitarian Station Mode</A><BR>
+					<A href='?src=\ref[src];secretsfun=guns'>Summon Guns</A><BR>
+					<A href='?src=\ref[src];secretsfun=magic'>Summon Magic</A><BR>
 					<BR>
 					<A href='?src=\ref[src];secretsfun=securitylevel0'>Change Security Level To Green</A><BR>
 					<A href='?src=\ref[src];secretsfun=securitylevel1'>Change Security Level To Blue</A><BR>

code/modules/admin/topic.dm

@@ -2274,6 +2274,14 @@
 				feedback_add_details("admin_secrets_fun_used","OO")
 				usr.client.only_one()
 //				message_admins("[key_name_admin(usr)] has triggered a battle to the death (only one)")
+			if("guns")
+				feedback_inc("admin_secrets_fun_used",1)
+				feedback_add_details("admin_secrets_fun_used","SG")
+				usr.rightandwrong(0)
+			if("magic")
+				feedback_inc("admin_secrets_fun_used",1)
+				feedback_add_details("admin_secrets_fun_used","SM")
+				usr.rightandwrong(1)
 			if("securitylevel0")
 				set_security_level(0)
 				message_admins("\blue [key_name_admin(usr)] change security level to Green.", 1)

code/modules/projectiles/guns/magic/wand.dm

@@ -2,7 +2,7 @@
 	name = "wand of nothing"
 	desc = "It's not just a stick, it's a MAGIC stick!"
 	projectile_type = "/obj/item/projectile/magic"
-	icon_state = "wand6"
+	icon_state = "nothingwand"
 	item_state = "wand"
 	w_class = 2
 	can_charge = 0
@@ -35,11 +35,12 @@
 	..()
 
 /obj/item/weapon/gun/magic/wand/afterattack(atom/target as mob, mob/living/user as mob)
+	if(!charges)
+		user << "<span class='warning'>The [name] whizzles quietly.<span>"
+		icon_state = "[icon_state]-drained"
+		return
 	if(target == user)
-		if(charges)
-			zap_self(user)
-		else
-			user << "<span class='caution'>The [name] whizzles quietly.<span>"
+		zap_self(user)
 	else
 		..()
 
@@ -50,7 +51,7 @@
 	name = "wand of death"
 	desc = "This deadly wand overwhelms the victim's body with pure energy, slaying them without fail."
 	projectile_type = "/obj/item/projectile/magic/death"
-	icon_state = "wand4"
+	icon_state = "deathwand"
 	max_charges = 3 //3, 2, 2, 1
 
 /obj/item/weapon/gun/magic/wand/death/zap_self(mob/living/user as mob)
@@ -66,7 +67,7 @@
 	name = "wand of resurrection"
 	desc = "This wand uses healing magics to heal and revive. They are rarely utilized within the Wizard Federation for some reason."
 	projectile_type = "/obj/item/projectile/magic/resurrection"
-	icon_state = "wand1"
+	icon_state = "revivewand"
 	max_charges = 3 //3, 2, 2, 1
 
 /obj/item/weapon/gun/magic/wand/resurrection/zap_self(mob/living/user as mob)
@@ -87,7 +88,7 @@
 	name = "wand of polymorph"
 	desc = "This wand is attuned to chaos and will radically alter the victim's form."
 	projectile_type = "/obj/item/projectile/magic/change"
-	icon_state = "wand5"
+	icon_state = "polywand"
 	max_charges = 10 //10, 5, 5, 4
 
 /obj/item/weapon/gun/magic/wand/polymorph/zap_self(mob/living/user as mob)
@@ -100,7 +101,7 @@
 	name = "wand of teleportation"
 	desc = "This wand will wrench targets through space and time to move them somewhere else."
 	projectile_type = "/obj/item/projectile/magic/teleport"
-	icon_state = "wand3"
+	icon_state = "telewand"
 	max_charges = 10 //10, 5, 5, 4
 
 /obj/item/weapon/gun/magic/wand/teleport/zap_self(mob/living/user as mob)
@@ -115,7 +116,7 @@
 	name = "wand of door creation"
 	desc = "This particular wand can create doors in any wall for the unscrupulous wizard who shuns teleportation magics."
 	projectile_type = "/obj/item/projectile/magic/door"
-	icon_state = "wand0"
+	icon_state = "doorwand"
 	max_charges = 20 //20, 10, 10, 7
 
 /obj/item/weapon/gun/magic/wand/door/zap_self()
@@ -125,7 +126,7 @@
 	name = "wand of fireball"
 	desc = "This wand shoots scorching balls of fire that explode into destructive flames."
 	projectile_type = "/obj/item/projectile/magic/fireball"
-	icon_state = "wand2"
+	icon_state = "firewand"
 	max_charges = 8 //8, 4, 4, 3
 
 /obj/item/weapon/gun/magic/wand/fireball/zap_self(mob/living/user as mob)

code/modules/projectiles/projectile/magic.dm

@@ -38,21 +38,26 @@
 
 	if(istype(target,/mob))
 		var/old_stat = target.stat
-		if(target.stat == DEAD)
-			dead_mob_list -= target
-			living_mob_list += target
-		target.stat = CONSCIOUS
-		target.tod = null
-		target.setToxLoss(0)
-		target.setOxyLoss(0)
-		target.setCloneLoss(0)
-		target.SetParalysis(0)
-		target.SetStunned(0)
-		target.SetWeakened(0)
-		target.radiation = 0
-		target.heal_overall_damage(target.getBruteLoss(), target.getFireLoss())
-		target.reagents.clear_reagents()
-		target.suiciding = 0
+		if(isanimal(target) && target.stat == DEAD)
+			var/mob/living/simple_animal/O = target
+			var/mob/living/simple_animal/A = new O.type(O.loc)
+			A.real_name = O.real_name
+			A.name = O.name
+			if(iscorgi(O))
+				var/mob/living/simple_animal/corgi/C = O
+				if(C.inventory_head)
+					C.inventory_head.loc = C.loc
+				if(C.inventory_back)
+					C.inventory_back.loc = C.loc
+			if(O.mind)
+				O.mind.transfer_to(A)
+			else
+				A.key = O.key
+			del(O)
+			target = A
+		else
+			target.revive()
+			target.suiciding = 0
 		if(!target.ckey)
 			for(var/mob/dead/observer/ghost in player_list)
 				if(target.real_name == ghost.real_name)