diff --git a/code/modules/religion/religion_sects.dm b/code/modules/religion/religion_sects.dm index 12aba6dbc5b..9cd6ded504d 100644 --- a/code/modules/religion/religion_sects.dm +++ b/code/modules/religion/religion_sects.dm @@ -56,7 +56,7 @@ if(initial(RI.favor_cost)) name_entry += " ([initial(RI.favor_cost)] favor)" - . += list(name_entry = i) + . += list("[name_entry]" = i) /// Activates once selected /datum/religion_sect/proc/on_select() diff --git a/code/modules/religion/religion_structures.dm b/code/modules/religion/religion_structures.dm index b86fa0198d8..638dfd6de90 100644 --- a/code/modules/religion/religion_structures.dm +++ b/code/modules/religion/religion_structures.dm @@ -15,15 +15,22 @@ /obj/structure/altar_of_gods/examine(mob/user) . = ..() - if(!isliving(user)) + var/can_i_see = FALSE + if(isobserver(user)) + can_i_see = TRUE + else if(isliving(user)) + var/mob/living/L = user + if(L.mind?.holy_role) + can_i_see = TRUE + + if(!can_i_see || !sect_to_altar) return - var/mob/living/L = user - if(L.mind?.holy_role && sect_to_altar) - . += "The sect currently has [round(sect_to_altar.favor)] with [GLOB.deity]." - if(!sect_to_altar.rites_list) - return - . += "List of available Rites:" - . += sect_to_altar.rites_list + + . += "The sect currently has [round(sect_to_altar.favor)] favor with [GLOB.deity]." + if(!sect_to_altar.rites_list) + return + . += "List of available Rites:" + . += sect_to_altar.rites_list /obj/structure/altar_of_gods/Initialize(mapload) @@ -68,12 +75,12 @@ to_chat(user,"You cannot perform the rite at this time.") return var/selection2type = sect_to_altar.rites_list[rite_select] - performing_rite = new selection2type(src, src) + performing_rite = new selection2type(src) if(!performing_rite.perform_rite(user, src)) QDEL_NULL(performing_rite) else performing_rite.invoke_effect(user, src) - sect_to_altar.adjust_favor(performing_rite.favor_cost*-1) + sect_to_altar.adjust_favor(-performing_rite.favor_cost) QDEL_NULL(performing_rite) return diff --git a/code/modules/religion/rites.dm b/code/modules/religion/rites.dm index acac35baea0..9cb9153a014 100644 --- a/code/modules/religion/rites.dm +++ b/code/modules/religion/rites.dm @@ -59,6 +59,7 @@ /datum/religion_rites/synthconversion/perform_rite(mob/living/user, obj/structure/altar_of_gods/AOG) if(!AOG?.buckled_mobs?.len) + to_chat(user, "This rite requires an individual to be buckled to [AOG].") return FALSE return ..()