From 831ea372f82a3c4189905445e8264400fd82235e Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Tue, 4 Aug 2020 17:33:57 +0200 Subject: [PATCH] buncha stuff adds a check if the sigil is already busy which I forgot before, makes the brass claw wounds-2 compartible and changes some misc stuff --- .../antagonists/clockcult/clock_effects/clock_sigils.dm | 3 +++ .../antagonists/clockcult/clock_helpers/clock_rites.dm | 6 +++--- .../clockcult/clock_items/clock_weapons/brass_claw.dm | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm index 6a7ff474a3..454870d1e1 100644 --- a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm +++ b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm @@ -427,6 +427,9 @@ return if(!GLOB.all_clockwork_rites.len) //Did we already generate the list? generate_all_rites() + if(performing_rite) + to_chat(user, "Someone is already performing a rite here!") + return var/list/possible_rites = list() for(var/datum/clockwork_rite/R in GLOB.all_clockwork_rites) possible_rites[R] = R diff --git a/code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm b/code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm index cb44f7e299..7dabb18f03 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm @@ -5,9 +5,9 @@ //The base clockwork rite. This should never be visible /datum/clockwork_rite - var/name = "Some random clockwork rite that you should not be able to see" //The name of the rite - var/desc = "Someone forgot to set the description of this rite.. you shouldn't see this." //What does this rite do? Shown to cultists if they choose 'Show Info' after selecting the rite. - var/list/required_ingredients = list() //What does this rite require? + var/name = "Rite of THE frog" //The name of the rite + var/desc = "This rite is used to summon the legendary frog whose-name-shall-not-be-spoken, ender of many worlds." //What does this rite do? Shown to cultists if they choose 'Show Info' after selecting the rite. + var/list/required_ingredients = list(/obj/item/clockwork) //What does this rite require? var/power_cost = 0 //How much power does this rite cost.. or does it even add power? var/requires_human = FALSE //Does the rite require a ../carbon/human on the rune? var/must_be_servant = TRUE //If the above is true, does the human need to be a servant? diff --git a/code/modules/antagonists/clockcult/clock_items/clock_weapons/brass_claw.dm b/code/modules/antagonists/clockcult/clock_items/clock_weapons/brass_claw.dm index 9498ed85a6..340f01f6f8 100644 --- a/code/modules/antagonists/clockcult/clock_items/clock_weapons/brass_claw.dm +++ b/code/modules/antagonists/clockcult/clock_items/clock_weapons/brass_claw.dm @@ -17,7 +17,7 @@ armour_penetration = 20 hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sharpness = IS_SHARP + sharpness = SHARP_EDGED wound_bonus = 5 bare_wound_bonus = 15 total_mass = TOTAL_MASS_HAND_REPLACEMENT