From 07c02e1c9936a91d7c81bc8a3747127f6b152ba8 Mon Sep 17 00:00:00 2001 From: Letter N <24603524+LetterN@users.noreply.github.com> Date: Tue, 4 Aug 2020 16:26:30 +0800 Subject: [PATCH] Commit message. Fixes slab --- .../clockcult/clock_items/clockwork_slab.dm | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm index 1ed217e914..dd31542785 100644 --- a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm +++ b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm @@ -36,6 +36,11 @@ speed_multiplier = 0 no_cost = TRUE +/obj/item/clockwork/slab/debug/on_attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags) + if(!is_servant_of_ratvar(user)) + add_servant_of_ratvar(user) + return ..() + /obj/item/clockwork/slab/traitor var/spent = FALSE @@ -54,11 +59,6 @@ to_chat(user, "[src] falls dark. It appears you weren't worthy.") return ..() -/obj/item/clockwork/slab/debug/on_attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags) - if(!is_servant_of_ratvar(user)) - add_servant_of_ratvar(user) - return ..() - /obj/item/clockwork/slab/cyborg //three scriptures, plus a spear and fabricator clockwork_desc = "A divine link to the Celestial Derelict, allowing for limited recital of scripture." quickbound = list(/datum/clockwork_scripture/ranged_ability/judicial_marker, /datum/clockwork_scripture/ranged_ability/linked_vanguard, \ @@ -142,14 +142,15 @@ /obj/item/clockwork/slab/examine(mob/user) . = ..() - if(is_servant_of_ratvar(user) || isobserver(user)) - if(LAZYLEN(quickbound)) - for(var/i in 1 to quickbound.len) - if(!quickbound[i]) - continue - var/datum/clockwork_scripture/quickbind_slot = quickbound[i] - . += "Quickbind button: [initial(quickbind_slot.name)]." - . += "Available power: [DisplayPower(get_clockwork_power())]." + if(!is_servant_of_ratvar(user) || !isobserver(user)) + return + if(LAZYLEN(quickbound)) + for(var/i in 1 to quickbound.len) + if(!quickbound[i]) + continue + var/datum/clockwork_scripture/quickbind_slot = quickbound[i] + . += "Quickbind button: [initial(quickbind_slot.name)]." + . += "Available power: [DisplayPower(get_clockwork_power())]." //Slab actions; Hierophant, Quickbind /obj/item/clockwork/slab/ui_action_click(mob/user, action) @@ -228,10 +229,10 @@ /obj/item/clockwork/slab/proc/get_recollection(what) //Now DMDOC compliant!* . = list() switch(what) //need someone to rewrite info for this. - /* if("Default") .["title"] = "Default" - .["info"] = "copypaste." + .["info"] = "Hello servant! Currently these categories dosen't work!" + /* if("Basics") .["title"] = "Basics" .["info"] = "# MARKDOWN WITH HTML?" @@ -310,7 +311,7 @@ . = list() .["tier_infos"] = list() //HEY!! WHEN ADDING NEW TIER, ADD IT HERE .["tier_infos"][SCRIPTURE_PERIPHERAL] = list( - "requirement" = "Breaking the code DM side. Report to coggerbus if this appears!!" + "requirement" = "Breaking the code DM side. Report to coggerbus if this appears!!", "ready" = FALSE //just in case. Should NOT exist at all ) .["tier_infos"][SCRIPTURE_DRIVER] = list( @@ -331,7 +332,7 @@ ) generate_all_scripture() - .["recollection_categories"] = list() + .["recollection_categories"] = list() if(GLOB.ratvar_awakens) return .["recollection_categories"] = list(