cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fix altars not allowing items to be sacrificed [MDB IGNORE] (#23957)

Browse Source 
* Fix altars not allowing items to be sacrificed (#78542)

## About The Pull Request
Fixes #78529
Caused by #78429

They forgot to include the `!` operator when doing an early return for
sacrificial items. Also cleaned up a little bit of the code.

## Why It's Good For The Game
Chaplains can now perform their holy duties properly.

## Changelog
🆑
fix: Fix altars not allowing items to be sacrificed
/🆑

* Fix altars not allowing items to be sacrificed

---------

Co-authored-by: Tim <timothymtorres@gmail.com>
This commit is contained in:
SkyratBot
2023-09-27 14:22:57 -04:00
committed by GitHub
co-authored by Tim
parent c142557087
commit d24ae4f7cd
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/religious_tool.dm
+2 -2
View File
@@ -74,9 +74,9 @@
/**********Sacrificing**********/
else if(operation_flags & RELIGION_TOOL_SACRIFICE)
if(easy_access_sect?.can_sacrifice(the_item,user))
if(!easy_access_sect?.can_sacrifice(the_item, user))
return
easy_access_sect.on_sacrifice(the_item,user)
easy_access_sect.on_sacrifice(the_item, user)
return COMPONENT_NO_AFTERATTACK
/datum/component/religious_tool/ui_interact(mob/user, datum/tgui/ui)
code/modules/religion/religion_sects.dm
+16 -15
View File
@@ -55,8 +55,8 @@
/// Activates once selected and on newjoins, oriented around people who become holy.
/datum/religion_sect/proc/on_conversion(mob/living/chap)
SHOULD_CALL_PARENT(TRUE)
to_chat(chap, "<span class='bold notice'>\"[quote]\"</span>")
to_chat(chap, "<span class='notice'>[desc]</span>")
to_chat(chap, span_boldnotice("\"[quote]\""))
to_chat(chap, span_notice("[desc]"))
/// Activates if religious sect is reset by admins, should clean up anything you added on conversion.
/datum/religion_sect/proc/on_deconversion(mob/living/chap)
@@ -66,17 +66,17 @@
to_chat(chap, span_notice("Return to an altar to reform your sect."))
/// Returns TRUE if the item can be sacrificed. Can be modified to fit item being tested as well as person offering. Returning TRUE will stop the attackby sequence and proceed to on_sacrifice.
/datum/religion_sect/proc/can_sacrifice(obj/item/I, mob/living/chap)
/datum/religion_sect/proc/can_sacrifice(obj/item/sacrifice, mob/living/chap)
. = TRUE
if(chap.mind.holy_role == HOLY_ROLE_DEACON)
to_chat(chap, "<span class='warning'>You are merely a deacon of [GLOB.deity], and therefore cannot perform rites.")
return
if(!is_type_in_typecache(I,desired_items_typecache))
if(!is_type_in_typecache(sacrifice, desired_items_typecache))
return FALSE
/// Activates when the sect sacrifices an item. This proc has NO bearing on the attackby sequence of other objects when used in conjunction with the religious_tool component.
/datum/religion_sect/proc/on_sacrifice(obj/item/I, mob/living/chap)
return adjust_favor(default_item_favor,chap)
/datum/religion_sect/proc/on_sacrifice(obj/item/sacrifice, mob/living/chap)
return adjust_favor(default_item_favor, chap)
/// Returns a description for religious tools
/datum/religion_sect/proc/tool_examine(mob/living/holy_creature)
@@ -89,7 +89,7 @@
. = favor //if favor = 5 and we want to subtract 10, we'll only be able to subtract 5
if((favor + amount > max_favor))
. = (max_favor-favor) //if favor = 5 and we want to add 10 with a max of 10, we'll only be able to add 5
favor = clamp(0,max_favor, favor+amount)
favor = clamp(0, max_favor, favor+amount)
/// Sets favor to a specific amount. Can provide optional features based on a user.
/datum/religion_sect/proc/set_favor(amount = 0, mob/living/chap)
@@ -190,16 +190,17 @@
blessed.add_mood_event("blessing", /datum/mood_event/blessing)
return TRUE
/datum/religion_sect/mechanical/on_sacrifice(obj/item/I, mob/living/chap)
var/obj/item/stock_parts/cell/the_cell = I
if(!istype(the_cell)) //how...
/datum/religion_sect/mechanical/on_sacrifice(obj/item/stock_parts/cell/power_cell, mob/living/chap)
if(!istype(power_cell))
return
if(the_cell.charge < 300)
to_chat(chap,span_notice("[GLOB.deity] does not accept pity amounts of power."))
if(power_cell.charge < 300)
to_chat(chap, span_notice("[GLOB.deity] does not accept pity amounts of power."))
return
adjust_favor(round(the_cell.charge/300), chap)
to_chat(chap, span_notice("You offer [the_cell]'s power to [GLOB.deity], pleasing them."))
qdel(I)
adjust_favor(round(power_cell.charge/300), chap)
to_chat(chap, span_notice("You offer [power_cell]'s power to [GLOB.deity], pleasing them."))
qdel(power_cell)
return TRUE
/**** Pyre God ****/