From 7e88d05b1d224d2ac907a8d49f056f7db8647c4c Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 26 Jan 2020 00:50:26 -0700 Subject: [PATCH] items --- .../clockcult/clock_items/clockwork_slab.dm | 5 ++++- .../antagonists/clockcult/clock_scripture.dm | 4 ++-- .../clock_scriptures/scripture_scripts.dm | 2 +- code/modules/antagonists/cult/cult_items.dm | 5 ++++- code/modules/uplink/uplink_items/uplink_roles.dm | 16 ++++++++++++++++ 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm index b1539c0ad9..f0e9ee4944 100644 --- a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm +++ b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm @@ -39,6 +39,9 @@ /obj/item/clockwork/slab/traitor var/spent = FALSE +/obj/item/clockwork/slab/traitor/check_uplink_validity() + return !spent + /obj/item/clockwork/slab/traitor/attack_self(mob/living/user) if(!is_servant_of_ratvar(user) && !spent) to_chat(user, "You press your hand onto [src], golden tendrils of light latching onto you. Was this the best of ideas?") @@ -47,7 +50,7 @@ else var/has_mindshield = locate(/obj/item/implant/mindshield) in user var/str = "It looks like your mind is protected. You can probably refund this with your uplink." - if(has_midnshield) + if(has_mindshield) str = "It looks like your mind is shielded, offering you a choice." to_chat(user, "[src] pulses, the tendrils wrapping around your head. [str]") if(alert(user, "Would you like to attempt to force the shielding influence from your mind? This will destroy your mindshield implant.", "Destroy mindshield?", "Yes", "No") == "Yes") diff --git a/code/modules/antagonists/clockcult/clock_scripture.dm b/code/modules/antagonists/clockcult/clock_scripture.dm index 98b0fff084..16d251fe92 100644 --- a/code/modules/antagonists/clockcult/clock_scripture.dm +++ b/code/modules/antagonists/clockcult/clock_scripture.dm @@ -30,7 +30,7 @@ Applications: 8 servants, 3 caches, and 100 CV var/primary_component var/important = FALSE //important scripture will be italicized in the slab's interface var/sort_priority = 1 //what position the scripture should have in a list of scripture. Should be based off of component costs/reqs, but you can't initial() lists. - var/require_full_power = FALSE //requires the user to be a full, non neutered servant of ratvar + var/requires_full_power = FALSE //requires the user to be a full, non neutered servant of ratvar //messages for offstation scripture recital, courtesy ratvar's generals(and neovgre) var/static/list/neovgre_penalty = list("Go to the station.", "Useless.", "Don't waste time.", "Pathetic.", "Wasteful.") @@ -78,7 +78,7 @@ Applications: 8 servants, 3 caches, and 100 CV /datum/clockwork_scripture/proc/can_recite() //If the words can be spoken if(!invoker || !slab || invoker.get_active_held_item() != slab) return FALSE - if(!is_servant_of_ratvar(invoker, require_full_power)) + if(!is_servant_of_ratvar(invoker, requires_full_power)) to_chat(invoker, "You aren't strongly connected enough to Ratvar to invoke this!") return FALSE if(!invoker.can_speak_vocal()) diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm index fb32eda309..d6296aeaa0 100644 --- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm +++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm @@ -76,7 +76,7 @@ return FALSE return ..() -/datum/clockwork_Scripture/create_object/vitality_matrix/get_spawn_path(mob/user) +/datum/clockwork_scripture/create_object/vitality_matrix/get_spawn_path(mob/user) if(!is_servant_of_ratvar(user, TRUE)) return /obj/effect/clockwork/sigil/vitality/neutered return ..() diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index f63c99a9ed..47762e366c 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -9,6 +9,9 @@ /obj/item/tome/traitor var/spent = FALSE +/obj/item/tome/traitor/check_uplink_validity() + return !spent + /obj/item/tome/traitor/attack_self(mob/living/user) if(!iscultist(user) && !spent) to_chat(user, "You press your hand onto [src], sinister tendrils of corrupted magic swirling around you. Was this the best of ideas?") @@ -17,7 +20,7 @@ else var/has_mindshield = locate(/obj/item/implant/mindshield) in user var/str = "It looks like your mind is protected. You can probably refund this with your uplink." - if(has_midnshield) + if(has_mindshield) str = "It looks like your mind is shielded, offering you a choice." to_chat(user, "[src] pulses, the tendrils wrapping around your head. [str]") if(alert(user, "Would you like to attempt to force the shielding influence from your mind? This will destroy your mindshield implant.", "Destroy mindshield?", "Yes", "No") == "Yes") diff --git a/code/modules/uplink/uplink_items/uplink_roles.dm b/code/modules/uplink/uplink_items/uplink_roles.dm index 89d3c25700..cf5f708093 100644 --- a/code/modules/uplink/uplink_items/uplink_roles.dm +++ b/code/modules/uplink/uplink_items/uplink_roles.dm @@ -92,6 +92,22 @@ restricted_roles = list("Chaplain") surplus = 5 //Very low chance to get it in a surplus crate even without being the chaplain +/datum/uplink_item/role_restricted/his_grace + name = "Clockwork Slab" + desc = "A reverse engineered clockwork slab. Is this really a good idea?." + item = /obj/item/clockwork/slab/traitor + cost = 20 + refundable = TRUE + restricted_roles = list("Chaplain") + +/datum/uplink_item/role_restricted/his_grace + name = "Arcane Tome" + desc = "A replica of a Nar'sian tome. This is probably a bad idea.." + item = /obj/item/tome/traitor + cost = 20 + refundable = TRUE + restricted_roles = list("Chaplain") + /datum/uplink_item/role_restricted/explosive_hot_potato name = "Exploding Hot Potato" desc = "A potato rigged with explosives. On activation, a special mechanism is activated that prevents it from being dropped. \