[MIRROR] Cult Vs. Heretic: 7 Months Later Edition (#28477)

* Cult Vs. Heretic: 7 Months Later Edition

* conflict fix

---------

Co-authored-by: carlarctg <53100513+carlarctg@users.noreply.github.com>
Co-authored-by: SpaceLoveSs13 <68121607+SpaceLoveSs13@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-07-04 21:22:23 +05:30
committed by GitHub
co-authored by carlarctg SpaceLoveSs13
parent 2240590b90
commit 4a60f108ab
91 changed files with 1761 additions and 405 deletions
@@ -289,7 +289,7 @@
deconstruct(TRUE)
return TRUE
/obj/structure/closet/crate/grave/container_resist_act(mob/living/user)
/obj/structure/closet/crate/grave/container_resist_act(mob/living/user, loc_required = TRUE)
if(opened)
return
// The player is trying to dig themselves out of an early grave