From 5e48fcd2751e8f51140c091eb8b5a153910ffad4 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Wed, 16 May 2018 12:46:30 +0300 Subject: [PATCH 1/2] Merge pull request #37846 from DaxDupont/axe-time Small cult nerf do not be alarmed robustin think about your heart --- code/game/objects/items/stacks/sheets/sheet_types.dm | 5 +++++ code/game/turfs/simulated/floor/reinf_floor.dm | 3 +-- code/modules/antagonists/cult/ritual.dm | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index b3af8b9b33..df3d5f799b 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -352,6 +352,11 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \ if(!iscultist(user)) to_chat(user, "Only one with forbidden knowledge could hope to work this metal...") return + var/turf/T = get_turf(user) //we may have moved. adjust as needed... + var/area/A = get_area(user) + if((!is_station_level(T.z) && !is_mining_level(T.z)) || (A && !A.blob_allowed)) + to_chat(user, "The veil is not weak enough here.") + return FALSE return ..() /obj/item/stack/sheet/runed_metal/Initialize(mapload, new_amount, merge = TRUE) diff --git a/code/game/turfs/simulated/floor/reinf_floor.dm b/code/game/turfs/simulated/floor/reinf_floor.dm index 78fe2b1bde..a51989d230 100644 --- a/code/game/turfs/simulated/floor/reinf_floor.dm +++ b/code/game/turfs/simulated/floor/reinf_floor.dm @@ -117,9 +117,8 @@ /turf/open/floor/engine/cult name = "engraved floor" - desc = "The air hangs heavy over this sinister flooring." + desc = "The air smells strangely over this sinister flooring." icon_state = "plating" - CanAtmosPass = ATMOS_PASS_NO floor_tile = null var/obj/effect/clockwork/overlay/floor/bloodcult/realappearance diff --git a/code/modules/antagonists/cult/ritual.dm b/code/modules/antagonists/cult/ritual.dm index dd129708a8..ba2ea53ef2 100644 --- a/code/modules/antagonists/cult/ritual.dm +++ b/code/modules/antagonists/cult/ritual.dm @@ -144,7 +144,8 @@ This file contains the cult dagger and rune list code if(locate(/obj/effect/rune) in T) to_chat(user, "There is already a rune here.") return FALSE - if(!is_station_level(T.z) && !is_mining_level(T.z)) + var/area/A = get_area(T) + if((!is_station_level(T.z) && !is_mining_level(T.z)) || (A && !A.blob_allowed)) to_chat(user, "The veil is not weak enough here.") return FALSE return TRUE