diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm index f451136dd67e..d39aaf5f4565 100644 --- a/code/modules/research/designs/biogenerator_designs.dm +++ b/code/modules/research/designs/biogenerator_designs.dm @@ -74,14 +74,6 @@ build_path = /obj/item/food/monkeycube category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_BIO_FOOD) -/datum/design/rat_cube // Monkestation, useful for chaplain and pathologist. - name = "Mouse Cube" - id = "rcube" // R for Rat - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = SMALL_MATERIAL_AMOUNT * 0.4) - build_path = /obj/item/food/monkeycube/mouse - category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_BIO_FOOD) - /datum/design/seaweed_sheet name = "Seaweed Sheet" id = "seaweedsheet" diff --git a/monkestation/code/modules/religion/maint_god.dm b/monkestation/code/modules/religion/maint_god.dm index d54bef093c7f..e35acdd6d4b2 100644 --- a/monkestation/code/modules/religion/maint_god.dm +++ b/monkestation/code/modules/religion/maint_god.dm @@ -10,7 +10,6 @@ /datum/religion_rites/weapon_granter/invoke_effect(mob/living/user, atom/movable/religious_tool) ..() - var/altar_turf = get_turf(religious_tool) new /obj/item/book/granter/crafting_recipe/maintgodgranter(get_turf(religious_tool)) return TRUE @@ -25,12 +24,15 @@ if(!ismovable(religious_tool)) to_chat(user, span_warning("This rite requires a religious device that individuals can be buckled to.")) return FALSE + if(!HAS_TRAIT_FROM(user, TRAIT_HOPELESSLY_ADDICTED, "maint_adaptation")) to_chat(user, span_warning("You need to adapt to maintenance first.")) return FALSE var/atom/movable/movable_reltool = religious_tool + if(!movable_reltool) return FALSE + if(LAZYLEN(movable_reltool.buckled_mobs)) to_chat(user, span_warning("You're going to convert the one buckled on [movable_reltool].")) else @@ -49,6 +51,7 @@ CRASH("[name]'s perform_rite had a movable atom that has somehow turned into a non-movable!") var/atom/movable/movable_reltool = religious_tool var/mob/living/carbon/human/rite_target + if(!length(movable_reltool.buckled_mobs)) rite_target = user else @@ -56,6 +59,7 @@ if(ishuman(buckled)) rite_target = buckled break + if(!rite_target) return FALSE rite_target.set_species(/datum/species/shadow) diff --git a/monkestation/code/modules/research/designs/biogenerator_designs.dm b/monkestation/code/modules/research/designs/biogenerator_designs.dm new file mode 100644 index 000000000000..c9a78c3e4c1d --- /dev/null +++ b/monkestation/code/modules/research/designs/biogenerator_designs.dm @@ -0,0 +1,7 @@ +/datum/design/rat_cube // Monkestation, useful for chaplain and pathologist. + name = "Mouse Cube" + id = "rcube" // R for Rat + build_type = BIOGENERATOR + materials = list(/datum/material/biomass = SMALL_MATERIAL_AMOUNT * 0.4) + build_path = /obj/item/food/monkeycube/mouse + category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_BIO_FOOD) diff --git a/tgstation.dme b/tgstation.dme index 4d2fcebe8726..448927d25dce 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6980,6 +6980,7 @@ #include "monkestation\code\modules\religion\maint_god.dm" #include "monkestation\code\modules\replays\hooks\generic_hooks.dm" #include "monkestation\code\modules\replays\subsystem\replay.dm" +#include "monkestation\code\modules\research\designs\biogenerator_designs.dm" #include "monkestation\code\modules\research\designs\computer_designs.dm" #include "monkestation\code\modules\research\designs\electronic_designs.dm" #include "monkestation\code\modules\research\designs\machine_designs.dm"