From 3995ae73cb6f22712ece551c38c1f27d68dffc79 Mon Sep 17 00:00:00 2001
From: Xhuis <asheturner60@gmail.com>
Date: Tue, 28 Apr 2015 17:10:08 -0400
Subject: [PATCH] Makes revvies admin-spawnable again

---
 code/modules/admin/topic.dm                                  | 5 ++---
 code/modules/admin/verbs/one_click_antag.dm                  | 4 ----
 code/modules/mob/living/simple_animal/revenant/revenant.dm   | 5 -----
 .../mob/living/simple_animal/revenant/revenant_abilities.dm  | 2 --
 .../living/simple_animal/revenant/revenant_spawn_event.dm    | 3 +--
 html/changelogs/Xhuis-RemoveRevenant.yml                     | 5 +++++
 6 files changed, 8 insertions(+), 16 deletions(-)
 create mode 100644 html/changelogs/Xhuis-RemoveRevenant.yml

diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 96420489c9f..3550a85bccc 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -107,13 +107,12 @@
 					message_admins("[key_name_admin(usr)] tried to create an abductor team. Unfortunatly there were not enough candidates available.")
 					log_admin("[key_name(usr)] failed to create an abductor team.")
 			if("15")
-				message_admins("[key_name(usr)] tried to create a revenant. However, revenants are currently pending a rewrite.")
-				/*if(src.makeRevenant())
+				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.")*/
+					log_admin("[key_name(usr)] failed to create a revenant.")
 
 	else if(href_list["forceevent"])
 		if(!check_rights(R_FUN))	return
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 4fe06ec8f2f..7d63ed56914 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -539,9 +539,6 @@ client/proc/one_click_antag()
 		return
 
 /datum/admins/proc/makeRevenant()
-	message_admins("NOTICE: Revenants are currently disabled until reworked.")
-	return
-	/*
 	var/list/mob/dead/observer/candidates = getCandidates("Do you wish to be considered for becoming a revenant?", "revenant", null)
 	if(candidates.len >= 1)
 		var/spook_op = pick(candidates)
@@ -554,7 +551,6 @@ client/proc/one_click_antag()
 		return 1
 	else
 		return
-	*/
 
 /datum/admins/proc/getCandidates(var/Question, var/jobbanType, var/datum/game_mode/gametypeCheck)
 	var/list/mob/dead/observer/candidates = list()
diff --git a/code/modules/mob/living/simple_animal/revenant/revenant.dm b/code/modules/mob/living/simple_animal/revenant/revenant.dm
index bccd071b7ec..e14a9902ee9 100644
--- a/code/modules/mob/living/simple_animal/revenant/revenant.dm
+++ b/code/modules/mob/living/simple_animal/revenant/revenant.dm
@@ -1,6 +1,3 @@
-/*
-	COMMENTED OUT -- PENDING REWORK
-
 //Revenants: based off of wraiths from Goon
 //"Ghosts" that are invisible and move like ghosts, cannot take damage while invsible
 //Don't hear deadchat and are NOT normal ghosts
@@ -173,5 +170,3 @@
 		else
 			user << "<span class='info'>Lost [essence_amt]E.</span>"
 	return 1
-
-*/
diff --git a/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm b/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm
index 049f990e47e..f0532fb5c7a 100644
--- a/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm
+++ b/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm
@@ -1,4 +1,3 @@
-/*
 //Harvest Essence: The bread and butter of the revenant. The basic way of harvesting additional essence.
 /obj/effect/proc_holder/spell/targeted/revenant_harvest
 	name = "Harvest (0E)"
@@ -337,4 +336,3 @@
 		M.drowsyness += 7
 		spawn(70)
 			M.sleeping += 30
-*/
diff --git a/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm b/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm
index 5bb3ad23a64..110274caaf6 100644
--- a/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm
+++ b/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm
@@ -1,8 +1,7 @@
-/*
 /datum/round_event_control/revenant
 	name = "Spawn Revenant"
 	typepath = /datum/round_event/revenant
-	weight = 15
+	weight = 0 //Admin only
 	max_occurrences = 3
 	earliest_start = 0 //Meant to mix things up early-game.
 
diff --git a/html/changelogs/Xhuis-RemoveRevenant.yml b/html/changelogs/Xhuis-RemoveRevenant.yml
new file mode 100644
index 00000000000..10c08252e86
--- /dev/null
+++ b/html/changelogs/Xhuis-RemoveRevenant.yml
@@ -0,0 +1,5 @@
+author: Xhuis
+delete-after: True
+
+changes: 
+  - rscdel: "Revenants will no longer spawn without admin intervention. They are pending a remake."