Merge branch 'master' into dynamic-transit

code/modules/admin/topic.dm

@@ -126,6 +126,13 @@
 				else
 					message_admins("[key_name_admin(usr)] tried to start a clockwork cult. Unfortunately, there were no candidates available.")
 					log_admin("[key_name(usr)] failed to start a clockwork cult.")
+			if("16")
+				if(src.makeRevenant())
+					message_admins("[key_name(usr)] created a revenant.")
+					log_admin("[key_name(usr)] created a revenant.")
+				else
+					message_admins("[key_name_admin(usr)] tried to create a revenant. Unfortunately, there were no candidates available.")
+					log_admin("[key_name(usr)] failed to create a revenant.")
 
 	else if(href_list["forceevent"])
 		if(!check_rights(R_FUN))

code/modules/admin/verbs/one_click_antag.dm

@@ -22,6 +22,7 @@
 		<a href='?src=\ref[src];makeAntag=7'>Make Nuke Team (Requires Ghosts)</a><br>
 		<a href='?src=\ref[src];makeAntag=13'>Make Centcom Response Team (Requires Ghosts)</a><br>
 		<a href='?src=\ref[src];makeAntag=14'>Make Abductor Team (Requires Ghosts)</a><br>
+		<a href='?src=\ref[src];makeAntag=15'>Make Revenant (Requires Ghost)</a><br>
 		"}
 
 	var/datum/browser/popup = new(usr, "oneclickantag", "Quick-Create Antagonist", 400, 400)
@@ -549,3 +550,7 @@
 /datum/admins/proc/makeAbductorTeam()
 	new /datum/round_event/ghost_role/abductor
 	return 1
+
+/datum/admins/proc/makeRevenant()
+	new /datum/round_event/ghost_role/revenant
+	return 1

code/modules/mob/mob_movement.dm

@@ -224,23 +224,20 @@
 					anim(mobloc,mob,'icons/mob/mob.dmi',,"shadow",,L.dir)
 				L.loc = get_step(L, direct)
 			L.setDir(direct)
-		if(3) //Incorporeal move, but blocked by holy-watered tiles and salt piles. Used by umbras.
-			if(!isumbra(L))
-				L.incorporeal_move = 1
-				return
-			var/mob/living/simple_animal/umbra/U = L
+		if(3) //Incorporeal move, but blocked by holy-watered tiles and salt piles.
 			var/turf/open/floor/stepTurf = get_step(L, direct)
 			for(var/obj/effect/decal/cleanable/salt/S in stepTurf)
-				U << "<span class='warning'>[S] bars your passage!</span>"
-				U.reveal(2, TRUE)
-				U.immobilize(2, TRUE)
+				L << "<span class='warning'>[S] bars your passage!</span>"
+				if(istype(L, /mob/living/simple_animal/revenant))
+					var/mob/living/simple_animal/revenant/R = L
+					R.reveal(20)
+					R.stun(20)
 				return
 			if(stepTurf.flags & NOJAUNT)
-				U << "<span class='warning'>Holy energies block your path!</span>"
-				U.immobilize(2, TRUE)
+				L << "<span class='warning'>Holy energies block your path.</span>"
 			else
-				U.loc = get_step(L, direct)
-				U.setDir(direct)
+				L.loc = get_step(L, direct)
+				L.setDir(direct)
 	return 1
 
 

code/modules/reagents/chemistry/reagents/blob_reagents.dm

@@ -539,7 +539,7 @@
 /datum/reagent/blob/adaptive_nexuses/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
 	reac_volume = ..()
 	if(O && ishuman(M) && M.stat == UNCONSCIOUS)
-		PoolOrNew(/obj/effect/overlay/temp/purple_sparkles, get_turf(M))
+		PoolOrNew(/obj/effect/overlay/temp/revenant, get_turf(M))
 		var/points = rand(5, 10)
 		O.add_points(points)
 		O << "<span class='notice'>Gained [points] resources from the death of [M].</span>"

code/modules/reagents/chemistry/recipes/pyrotechnics.dm

@@ -63,6 +63,15 @@
 	if(created_volume >= 150)
 		playsound(get_turf(holder.my_atom), 'sound/effects/pray.ogg', 80, 0, round(created_volume/48))
 		strengthdiv = 8
+		for(var/mob/living/simple_animal/revenant/R in get_hearers_in_view(7,get_turf(holder.my_atom)))
+			var/diety = ticker.Bible_deity_name
+			if(!ticker.Bible_deity_name)
+				diety = "Christ"
+			R << "<span class='userdanger'>The power of [diety] compels you!</span>"
+			R.stun(20)
+			R.reveal(100)
+			R.adjustHealth(50)
+		sleep(20)
 		for(var/mob/living/carbon/C in get_hearers_in_view(round(created_volume/48,1),get_turf(holder.my_atom)))
 			if(iscultist(C) || is_handofgod_cultist(C))
 				C << "<span class='userdanger'>The divine explosion sears you!</span>"