From cfc06d13dd7f42a4acaf702d5a596eb262e12425 Mon Sep 17 00:00:00 2001
From: DZD <leonardo.o.costa7@gmail.com>
Date: Tue, 20 Jan 2015 13:54:03 -0500
Subject: [PATCH] Chapel now makes vampires extra crispy

- Vampires burn similar to being in space while in the chapel.
---
 code/game/gamemodes/vampire/vampire.dm        | 32 +++++++++++--------
 code/game/gamemodes/vampire/vampire_powers.dm |  2 +-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm
index 7ab58e0f139..42eb879c5be 100644
--- a/code/game/gamemodes/vampire/vampire.dm
+++ b/code/game/gamemodes/vampire/vampire.dm
@@ -462,6 +462,24 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
 
 		if(T.density)
 			return
+	vamp_burn()
+
+/mob/living/carbon/human/proc/handle_vampire()
+	if(hud_used)
+		if(!hud_used.vampire_blood_display)
+			hud_used.vampire_hud()
+			hud_used.human_hud('icons/mob/screen1_Vampire.dmi')
+		hud_used.vampire_blood_display.maptext_width = 64
+		hud_used.vampire_blood_display.maptext_height = 26
+		hud_used.vampire_blood_display.maptext = "<div align='left' valign='top' style='position:relative; top:0px; left:6px'> U:<font color='#33FF33' size='1'>[mind.vampire.bloodusable]</font><br> T:<font color='#FFFF00' size='1'>[mind.vampire.bloodtotal]</font></div>"
+	handle_vampire_cloak()
+	if(istype(loc, /turf/space))
+		check_sun()
+	if(istype(loc.loc, /area/chapel) && !(VAMP_FULL in src.mind.vampire.powers))
+		vamp_burn()
+	mind.vampire.nullified = max(0, mind.vampire.nullified - 1)
+
+mob/living/carbon/human/proc/vamp_burn()
 	if(prob(35))
 		switch(health)
 			if(80 to 100)
@@ -482,16 +500,4 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
 				fire_stacks++
 				IgniteMob()
 	adjustFireLoss(3)
-
-/mob/living/carbon/human/proc/handle_vampire()
-	if(hud_used)
-		if(!hud_used.vampire_blood_display)
-			hud_used.vampire_hud()
-			hud_used.human_hud('icons/mob/screen1_Vampire.dmi')
-		hud_used.vampire_blood_display.maptext_width = 64
-		hud_used.vampire_blood_display.maptext_height = 26
-		hud_used.vampire_blood_display.maptext = "<div align='left' valign='top' style='position:relative; top:0px; left:6px'> U:<font color='#33FF33' size='1'>[mind.vampire.bloodusable]</font><br> T:<font color='#FFFF00' size='1'>[mind.vampire.bloodtotal]</font></div>"
-	handle_vampire_cloak()
-	if(istype(loc, /turf/space))
-		check_sun()
-	mind.vampire.nullified = max(0, mind.vampire.nullified - 1)
+	return
diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm
index c55a980912f..3ec453f56d7 100644
--- a/code/game/gamemodes/vampire/vampire_powers.dm
+++ b/code/game/gamemodes/vampire/vampire_powers.dm
@@ -28,7 +28,7 @@
 		src << "<span class='warning'>You require at least [required_blood] units of usable blood to do that!</span>"
 		return 0
 	//chapel check
-	if(istype(src.loc, /area/chapel))
+	if(istype(loc.loc, /area/chapel))
 		if(!fullpower)
 			src << "<span class='warning'>Your powers are useless on this holy ground.</span>"
 			return 0