Skip to content

Commit

Permalink
turf thing, spacing, modularization
Browse files Browse the repository at this point in the history
  • Loading branch information
Uristthedorf committed Jul 4, 2024
1 parent c42df33 commit 5fa356b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 9 deletions.
8 changes: 0 additions & 8 deletions code/modules/research/designs/biogenerator_designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 5 additions & 1 deletion monkestation/code/modules/religion/maint_god.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -49,13 +51,15 @@
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
for(var/buckled in movable_reltool.buckled_mobs)
if(ishuman(buckled))
rite_target = buckled
break

if(!rite_target)
return FALSE
rite_target.set_species(/datum/species/shadow)
Expand Down
Original file line number Diff line number Diff line change
@@ -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)
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 5fa356b

Please sign in to comment.