diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 876748838ae..4d58f34f1e7 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -32,6 +32,10 @@ to_chat(user, "An overwhelming sense of nausea overpowers you!") user.Dizzy(120) + if(HULK in user.mutations) + to_chat(user, "You can't seem to hold the blade properly!") + user.unEquip(src, 1) + /obj/item/weapon/melee/cultblade/dagger name = "sacrificial dagger" desc = "A strange dagger said to be used by sinister groups for \"preparing\" a corpse before sacrificing it to their dark gods." diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 10f6b92f517..182ed68e004 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -54,6 +54,10 @@ to_chat(user, "\The [src] is [anchored ? "":"not "]secured to the floor.") /obj/structure/cult/functional/attackby(obj/I, mob/user, params) + if(HULK in user.mutations) + to_chat(user, "You cannot seem to manipulate this structure with your bulky hands!") + return + if(istype(I, /obj/item/weapon/tome) && iscultist(user)) anchored = !anchored to_chat(user, "You [anchored ? "":"un"]secure \the [src] [anchored ? "to":"from"] the floor.") @@ -180,7 +184,7 @@ var/list/blacklisted_pylon_turfs = typecacheof(list( death_message = "The pylon's crystal vibrates and glows fiercely before violently shattering!" death_sound = 'sound/effects/pylon_shatter.ogg' - var/heal_delay = 25 + var/heal_delay = 30 var/last_heal = 0 var/corrupt_delay = 50 var/last_corrupt = 0 diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 029cb8cd4a5..5ce0a786cab 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -258,13 +258,13 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( * Runed Metal */ -var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \ - new/datum/stack_recipe("runed door", /obj/machinery/door/airlock/cult, 1, time = 50, one_per_turf = 1, on_floor = 1), - new/datum/stack_recipe("runed girder", /obj/structure/girder/cult, 1, time = 50, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("pylon", /obj/structure/cult/functional/pylon, 3, time = 40, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("forge", /obj/structure/cult/functional/forge, 5, time = 40, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("archives", /obj/structure/cult/functional/tome, 2, time = 40, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("altar", /obj/structure/cult/functional/talisman, 5, time = 40, one_per_turf = 1, on_floor = 1), \ +var/global/list/datum/stack_recipe/cult = list ( \ + new/datum/stack_recipe/cult("runed door", /obj/machinery/door/airlock/cult, 1, time = 50, one_per_turf = 1, on_floor = 1), + new/datum/stack_recipe/cult("runed girder", /obj/structure/girder/cult, 1, time = 50, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe/cult("pylon", /obj/structure/cult/functional/pylon, 3, time = 40, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe/cult("forge", /obj/structure/cult/functional/forge, 5, time = 40, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe/cult("archives", /obj/structure/cult/functional/tome, 2, time = 40, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe/cult("altar", /obj/structure/cult/functional/talisman, 5, time = 40, one_per_turf = 1, on_floor = 1), \ ) /obj/item/stack/sheet/runed_metal @@ -280,13 +280,27 @@ var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \ if(!iscultist(user)) to_chat(user, "Only one with forbidden knowledge could hope to work this metal...") return + if(!is_level_reachable(user.z)) + to_chat(user, "The energies of this place interfere with the metal shaping!") + return + return ..() +/datum/stack_recipe/cult + one_per_turf = 1 + on_floor = 1 + +/datum/stack_recipe/cult/post_build(obj/item/stack/S, obj/result) + if(ishuman(S.loc)) + var/mob/living/carbon/human/H = S.loc + H.bleed(5) + ..() + /obj/item/stack/sheet/runed_metal/fifty amount = 50 /obj/item/stack/sheet/runed_metal/New(var/loc, var/amount=null) - recipes = runed_metal_recipes + recipes = cult return ..() /*