Merge pull request #15757 from warior4356/holy-chapel

Makes the chapel holy once more.
This commit is contained in:
variableundefined
2021-07-25 08:37:18 -04:00
committed by GitHub
15 changed files with 123 additions and 12 deletions
@@ -94,6 +94,17 @@
/mob/living/simple_animal/hostile/construct/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
return FALSE
/mob/living/simple_animal/hostile/construct/Life(seconds, times_fired)
if(holy_check(src))
throw_alert("holy_fire", /obj/screen/alert/holy_fire, override = TRUE)
visible_message("<span class='danger'>[src] slowly crumbles to dust in this holy place!</span>", \
"<span class='danger'>Your shell burns as you crumble to dust in this holy place!</span>")
playsound(loc, 'sound/items/welder.ogg', 150, TRUE)
adjustBruteLoss(maxHealth/8)
else
clear_alert("holy_fire", clear_override = TRUE)
return ..()
/////////////////Juggernaut///////////////
+28
View File
@@ -1461,3 +1461,31 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
*/
/mob/proc/update_runechat_msg_location()
return
GLOBAL_LIST_INIT(holy_areas, typecacheof(list(
/area/chapel
)))
/mob/proc/holy_check()
if(!is_type_in_typecache(loc.loc, GLOB.holy_areas))
return FALSE
if(!mind)
return FALSE
//Allows fullpower vampires to bypass holy areas
var/datum/vampire/vampire = mind.vampire
if(vampire && vampire.get_ability(/datum/vampire_passive/full))
return FALSE
//Allows cult to bypass holy areas once they summon
var/datum/game_mode/gamemode = SSticker.mode
if(iscultist(src) && gamemode.cult_objs.cult_status == NARSIE_HAS_RISEN)
return FALSE
//Execption for Holy Constructs
if(isconstruct(src) && !iscultist(src))
return FALSE
to_chat(src, "<span class='warning'>Your powers are useless on this holy ground.</span>")
return TRUE