diff --git a/code/__DEFINES/clockcult.dm b/code/__DEFINES/clockcult.dm index a61919183a4..89a39c9ab56 100644 --- a/code/__DEFINES/clockcult.dm +++ b/code/__DEFINES/clockcult.dm @@ -1,20 +1,29 @@ +//component id defines +#define BELLIGERENT_EYE "belligerent_eye" +#define VANGUARD_COGWHEEL "vanguard_cogwheel" +#define GUVAX_CAPACITOR "guvax_capacitor" +#define REPLICANT_ALLOY "replicant_alloy" +#define HIEROPHANT_ANSIBLE "hierophant_ansible" + var/global/clockwork_construction_value = 0 //The total value of all structures built by the clockwork cult var/global/clockwork_caches = 0 //How many clockwork caches exist in the world (not each individual) var/global/clockwork_daemons = 0 //How many daemons exist in the world var/global/list/clockwork_generals_invoked = list("nezbere" = FALSE, "sevtug" = FALSE, "nzcrentr" = FALSE, "inath-neq" = FALSE) //How many generals have been recently invoked var/global/list/all_clockwork_objects = list() //All clockwork items, structures, and effects in existence var/global/list/all_clockwork_mobs = list() //All clockwork SERVANTS (not creatures) in existence -var/global/list/clockwork_component_cache = list("belligerent_eye" = 0, "vanguard_cogwheel" = 0, "guvax_capacitor" = 0, "replicant_alloy" = 0, "hierophant_ansible" = 0) //The pool of components that caches draw from +var/global/list/clockwork_component_cache = list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GUVAX_CAPACITOR = 0, REPLICANT_ALLOY = 0, HIEROPHANT_ANSIBLE = 0) //The pool of components that caches draw from var/global/ratvar_awakens = FALSE //If Ratvar has been summoned var/global/clockwork_gateway_activated = FALSE //if a gateway to the celestial derelict has ever been successfully activated -#define SCRIPTURE_PERIPHERAL "Peripheral" //Scripture tiers; peripherals should never be used +//Scripture tiers; peripherals should never be used +#define SCRIPTURE_PERIPHERAL "Peripheral" #define SCRIPTURE_DRIVER "Driver" #define SCRIPTURE_SCRIPT "Script" #define SCRIPTURE_APPLICATION "Application" #define SCRIPTURE_REVENANT "Revenant" #define SCRIPTURE_JUDGEMENT "Judgement" +//general component/cooldown things #define SLAB_PRODUCTION_TIME 900 //how long(deciseconds) slabs require to produce a single component; defaults to 1 minute 30 seconds #define SLAB_SERVANT_SLOWDOWN 300 //how much each servant above 5 slows down slab-based generation; defaults to 30 seconds per sevant diff --git a/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm b/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm index b49d1795b5a..5862baab816 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm @@ -24,15 +24,15 @@ //returns a component name from a component id /proc/get_component_name(id) switch(id) - if("belligerent_eye") + if(BELLIGERENT_EYE) return "Belligerent Eye" - if("vanguard_cogwheel") + if(VANGUARD_COGWHEEL) return "Vanguard Cogwheel" - if("guvax_capacitor") + if(GUVAX_CAPACITOR) return "Guvax Capacitor" - if("replicant_alloy") + if(REPLICANT_ALLOY) return "Replicant Alloy" - if("hierophant_ansible") + if(HIEROPHANT_ANSIBLE) return "Hierophant Ansible" else return null @@ -41,30 +41,30 @@ /proc/get_component_id(name) switch(name) if("Belligerent Eye") - return "belligerent_eye" + return BELLIGERENT_EYE if("Vanguard Cogwheel") - return "vanguard_cogwheel" + return VANGUARD_COGWHEEL if("Guvax Capacitor") - return "guvax_capacitor" + return GUVAX_CAPACITOR if("Replicant Alloy") - return "replicant_alloy" + return REPLICANT_ALLOY if("Hierophant Ansible") - return "hierophant_ansible" + return HIEROPHANT_ANSIBLE else return null //returns a component spanclass from a component id /proc/get_component_span(id) switch(id) - if("belligerent_eye") + if(BELLIGERENT_EYE) return "neovgre" - if("vanguard_cogwheel") + if(VANGUARD_COGWHEEL) return "inathneq" - if("guvax_capacitor") + if(GUVAX_CAPACITOR) return "sevtug" - if("replicant_alloy") + if(REPLICANT_ALLOY) return "nezbere" - if("hierophant_ansible") + if(HIEROPHANT_ANSIBLE) return "nzcrentr" else return null @@ -72,15 +72,15 @@ //returns a component color from a component id /proc/get_component_color(id) switch(id) - if("belligerent_eye") + if(BELLIGERENT_EYE) return "#6E001A" - if("vanguard_cogwheel") + if(VANGUARD_COGWHEEL) return "#1E8CE1" - if("guvax_capacitor") + if(GUVAX_CAPACITOR) return "#AF0AAF" - if("replicant_alloy") + if(REPLICANT_ALLOY) return "#42474D" - if("hierophant_ansible") + if(HIEROPHANT_ANSIBLE) return "#DAAA18" else return "#BE8700" @@ -88,15 +88,15 @@ //returns a type for a floating component animation from a component id /proc/get_component_animation_type(id) switch(id) - if("belligerent_eye") + if(BELLIGERENT_EYE) return /obj/effect/overlay/temp/ratvar/component - if("vanguard_cogwheel") + if(VANGUARD_COGWHEEL) return /obj/effect/overlay/temp/ratvar/component/cogwheel - if("guvax_capacitor") + if(GUVAX_CAPACITOR) return /obj/effect/overlay/temp/ratvar/component/capacitor - if("replicant_alloy") + if(REPLICANT_ALLOY) return /obj/effect/overlay/temp/ratvar/component/alloy - if("hierophant_ansible") + if(HIEROPHANT_ANSIBLE) return /obj/effect/overlay/temp/ratvar/component/ansible else return null @@ -104,15 +104,15 @@ //returns a type for a component from a component id /proc/get_component_type(id) switch(id) - if("belligerent_eye") + if(BELLIGERENT_EYE) return /obj/item/clockwork/component/belligerent_eye - if("vanguard_cogwheel") + if(VANGUARD_COGWHEEL) return /obj/item/clockwork/component/vanguard_cogwheel - if("guvax_capacitor") + if(GUVAX_CAPACITOR) return /obj/item/clockwork/component/guvax_capacitor - if("replicant_alloy") + if(REPLICANT_ALLOY) return /obj/item/clockwork/component/replicant_alloy - if("hierophant_ansible") + if(HIEROPHANT_ANSIBLE) return /obj/item/clockwork/component/hierophant_ansible else return null \ No newline at end of file diff --git a/code/game/gamemodes/clock_cult/clock_items/clock_components.dm b/code/game/gamemodes/clock_cult/clock_items/clock_components.dm index 242c3f919ef..98223f2b5c6 100644 --- a/code/game/gamemodes/clock_cult/clock_items/clock_components.dm +++ b/code/game/gamemodes/clock_cult/clock_items/clock_components.dm @@ -26,7 +26,7 @@ name = "belligerent eye" desc = "A brass construct with a rotating red center. It's as though it's looking for something to hurt." icon_state = "belligerent_eye" - component_id = "belligerent_eye" + component_id = BELLIGERENT_EYE cultist_message = "The eye gives you an intensely hateful glare." servant_of_ratvar_messages = list("\"...\"" = FALSE, "For a moment, your mind is flooded with extremely violent thoughts." = FALSE, "\"...Die.\"" = TRUE) message_span = "neovgre" @@ -44,7 +44,7 @@ name = "vanguard cogwheel" desc = "A sturdy brass cog with a faintly glowing blue gem in its center." icon_state = "vanguard_cogwheel" - component_id = "vanguard_cogwheel" + component_id = VANGUARD_COGWHEEL cultist_message = "\"Pray to your god that we never meet.\"" servant_of_ratvar_messages = list("\"Be safe, child.\"" = FALSE, "You feel unexplainably comforted." = FALSE, "\"Never forget: pain is temporary. The Justiciar's glory is eternal.\"" = FALSE) message_span = "inathneq" @@ -63,7 +63,7 @@ name = "guvax capacitor" desc = "A curiously cold brass doodad. It seems as though it really doesn't appreciate being held." icon_state = "guvax_capacitor" - component_id = "guvax_capacitor" + component_id = GUVAX_CAPACITOR cultist_message = "\"Try not to lose your mind - I'll need it. Heh heh...\"" servant_of_ratvar_messages = list("\"Disgusting.\"" = FALSE, "\"Well, aren't you an inquisitive fellow?\"" = FALSE, "A foul presence pervades your mind, then vanishes." = FALSE, \ "\"The fact that Ratvar has to depend on simpletons like you is appalling.\"" = FALSE) @@ -83,7 +83,7 @@ name = "replicant alloy" desc = "A seemingly strong but very malleable chunk of metal. It seems as though it wants to be molded into something greater." icon_state = "replicant_alloy" - component_id = "replicant_alloy" + component_id = REPLICANT_ALLOY cultist_message = "The alloy takes on the appearance of a screaming face for a moment." servant_of_ratvar_messages = list("\"There's always something to be done. Get to it.\"" = FALSE, "\"Idle hands are worse than broken ones. Get to work.\"" = FALSE, \ "A detailed image of Ratvar appears in the alloy for a moment." = FALSE) @@ -126,7 +126,7 @@ name = "hierophant ansible" desc = "Some sort of transmitter? It seems as though it's trying to say something." icon_state = "hierophant_ansible" - component_id = "hierophant_ansible" + component_id = HIEROPHANT_ANSIBLE cultist_message = "\"Gur obff fnlf vg'f abg ntnvafg gur ehyrf gb-xvyy lbh.\"" servant_of_ratvar_messages = list("\"Exile is such a bore. There's nothing I can hunt in here.\"" = TRUE, "\"What's keeping you? I want to go kill something.\"" = TRUE, \ "\"HEHEHEHEHEHEH!\"" = FALSE, "\"If I killed you fast enough, do you think the boss would notice?\"" = TRUE) diff --git a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm index b2358e79dc7..75b595ef836 100644 --- a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm +++ b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm @@ -5,7 +5,7 @@ icon_state = "dread_ipad" slot_flags = SLOT_BELT w_class = 2 - var/list/stored_components = list("belligerent_eye" = 0, "vanguard_cogwheel" = 0, "guvax_capacitor" = 0, "replicant_alloy" = 0, "hierophant_ansible" = 0) + var/list/stored_components = list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GUVAX_CAPACITOR = 0, REPLICANT_ALLOY = 0, HIEROPHANT_ANSIBLE = 0) var/busy //If the slab is currently being used by something var/production_time = 0 var/no_cost = FALSE //If the slab is admin-only and needs no components and has no scripture locks @@ -15,7 +15,7 @@ actions_types = list(/datum/action/item_action/clock/hierophant, /datum/action/item_action/clock/guvax, /datum/action/item_action/clock/vanguard) /obj/item/clockwork/slab/starter - stored_components = list("belligerent_eye" = 1, "vanguard_cogwheel" = 1, "guvax_capacitor" = 1, "replicant_alloy" = 1, "hierophant_ansible" = 1) + stored_components = list(BELLIGERENT_EYE = 1, VANGUARD_COGWHEEL = 1, GUVAX_CAPACITOR = 1, REPLICANT_ALLOY = 1, HIEROPHANT_ANSIBLE = 1) /obj/item/clockwork/slab/internal //an internal motor for mobs running scripture name = "scripture motor" @@ -94,12 +94,12 @@ if(clockwork_caches) user << "Stored components (with global cache):" for(var/i in stored_components) - user << "[get_component_name(i)][i != "replicant_alloy" ? "s":""]: [stored_components[i]] \ + user << "[get_component_name(i)][i != REPLICANT_ALLOY ? "s":""]: [stored_components[i]] \ ([stored_components[i] + clockwork_component_cache[i]])" else user << "Stored components:" for(var/i in stored_components) - user << "[get_component_name(i)][i != "replicant_alloy" ? "s":""]: [stored_components[i]]" + user << "[get_component_name(i)][i != REPLICANT_ALLOY ? "s":""]: [stored_components[i]]" //Component Transferal /obj/item/clockwork/slab/attack(mob/living/target, mob/living/carbon/human/user) @@ -320,19 +320,19 @@ qdel(S2) var/scripture_text = "
[initial(S.name)]:
[initial(S.desc)]
Invocation Time: [initial(S.channel_time) / 10] seconds
\ Component Requirement: \ - [req_comps["belligerent_eye"] ? "[req_comps["belligerent_eye"]] BE" : ""] \ - [req_comps["vanguard_cogwheel"] ? "[req_comps["vanguard_cogwheel"]] VC" : ""] \ - [req_comps["guvax_capacitor"] ? "[req_comps["guvax_capacitor"]] GC" : ""] \ - [req_comps["replicant_alloy"] ? "[req_comps["replicant_alloy"]] RA" : ""] \ - [req_comps["hierophant_ansible"] ? "[req_comps["hierophant_ansible"]] HA" : ""]
" + [req_comps[BELLIGERENT_EYE] ? "[req_comps[BELLIGERENT_EYE]] BE" : ""] \ + [req_comps[VANGUARD_COGWHEEL] ? "[req_comps[VANGUARD_COGWHEEL]] VC" : ""] \ + [req_comps[GUVAX_CAPACITOR] ? "[req_comps[GUVAX_CAPACITOR]] GC" : ""] \ + [req_comps[REPLICANT_ALLOY] ? "[req_comps[REPLICANT_ALLOY]] RA" : ""] \ + [req_comps[HIEROPHANT_ANSIBLE] ? "[req_comps[HIEROPHANT_ANSIBLE]] HA" : ""]
" for(var/i in cons_comps) if(cons_comps[i]) scripture_text += "Component Cost: \ - [cons_comps["belligerent_eye"] ? "[cons_comps["belligerent_eye"]] BE" : ""] \ - [cons_comps["vanguard_cogwheel"] ? "[cons_comps["vanguard_cogwheel"]] VC" : ""] \ - [cons_comps["guvax_capacitor"] ? "[cons_comps["guvax_capacitor"]] GC" : ""] \ - [cons_comps["replicant_alloy"] ? "[cons_comps["replicant_alloy"]] RA" : ""] \ - [cons_comps["hierophant_ansible"] ? "[cons_comps["hierophant_ansible"]] HA" : ""]
" + [cons_comps[BELLIGERENT_EYE] ? "[cons_comps[BELLIGERENT_EYE]] BE" : ""] \ + [cons_comps[VANGUARD_COGWHEEL] ? "[cons_comps[VANGUARD_COGWHEEL]] VC" : ""] \ + [cons_comps[GUVAX_CAPACITOR] ? "[cons_comps[GUVAX_CAPACITOR]] GC" : ""] \ + [cons_comps[REPLICANT_ALLOY] ? "[cons_comps[REPLICANT_ALLOY]] RA" : ""] \ + [cons_comps[HIEROPHANT_ANSIBLE] ? "[cons_comps[HIEROPHANT_ANSIBLE]] HA" : ""]
" break //we want this to only show up if the scripture has a cost of some sort scripture_text += "Tip: [initial(S.usage_tip)]
" switch(initial(S.tier)) diff --git a/code/game/gamemodes/clock_cult/clock_scripture.dm b/code/game/gamemodes/clock_cult/clock_scripture.dm index b674a015faa..a7153c90063 100644 --- a/code/game/gamemodes/clock_cult/clock_scripture.dm +++ b/code/game/gamemodes/clock_cult/clock_scripture.dm @@ -15,8 +15,8 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or var/desc = "Ancient Ratvarian lore. This piece seems particularly mundane." var/list/invocations = list() //Spoken over time in the ancient language of Ratvar. See clock_unsorted.dm for more details on the language and how to make it. var/channel_time = 10 //In deciseconds, how long a ritual takes to chant - var/list/required_components = list("belligerent_eye" = 0, "vanguard_cogwheel" = 0, "guvax_capacitor" = 0, "replicant_alloy" = 0, "hierophant_ansible" = 0) //Components required - var/list/consumed_components = list("belligerent_eye" = 0, "vanguard_cogwheel" = 0, "guvax_capacitor" = 0, "replicant_alloy" = 0, "hierophant_ansible" = 0) //Components consumed + var/list/required_components = list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GUVAX_CAPACITOR = 0, REPLICANT_ALLOY = 0, HIEROPHANT_ANSIBLE = 0) //Components required + var/list/consumed_components = list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GUVAX_CAPACITOR = 0, REPLICANT_ALLOY = 0, HIEROPHANT_ANSIBLE = 0) //Components consumed var/obj/item/clockwork/slab/slab //The parent clockwork slab var/mob/living/invoker //The slab's holder var/whispered = FALSE //If the invocation is whispered rather than spoken aloud @@ -28,9 +28,9 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or 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. //components the scripture used from a slab - var/list/used_slab_components = list("belligerent_eye" = 0, "vanguard_cogwheel" = 0, "guvax_capacitor" = 0, "replicant_alloy" = 0, "hierophant_ansible" = 0) + var/list/used_slab_components = list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GUVAX_CAPACITOR = 0, REPLICANT_ALLOY = 0, HIEROPHANT_ANSIBLE = 0) //components the scripture used from the global cache - var/list/used_cache_components = list("belligerent_eye" = 0, "vanguard_cogwheel" = 0, "guvax_capacitor" = 0, "replicant_alloy" = 0, "hierophant_ansible" = 0) + var/list/used_cache_components = list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GUVAX_CAPACITOR = 0, REPLICANT_ALLOY = 0, HIEROPHANT_ANSIBLE = 0) /datum/clockwork_scripture/proc/run_scripture() if(can_recite() && has_requirements() && check_special_requirements()) @@ -84,7 +84,7 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or var/total_components = slab.stored_components[i] + cache_components if(required_components[i] && total_components < required_components[i]) component_printout += "\nYou have [total_components]/[required_components[i]] \ - [get_component_name(i)][i != "replicant_alloy" ? "s":""]." + [get_component_name(i)][i != REPLICANT_ALLOY ? "s":""]." failed = TRUE if(failed) component_printout += "" diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm index d7993e1f68a..cb93d6338fa 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm @@ -10,8 +10,8 @@ It will penetrate mindshield implants once before disappearing." invocations = list("Divinity, enslave...", "...all who trespass here!") channel_time = 70 - required_components = list("belligerent_eye" = 3, "guvax_capacitor" = 1, "hierophant_ansible" = 1) - consumed_components = list("belligerent_eye" = 2, "guvax_capacitor" = 1, "hierophant_ansible" = 1) + required_components = list(BELLIGERENT_EYE = 3, GUVAX_CAPACITOR = 1, HIEROPHANT_ANSIBLE = 1) + consumed_components = list(BELLIGERENT_EYE = 2, GUVAX_CAPACITOR = 1, HIEROPHANT_ANSIBLE = 1) whispered = TRUE object_path = /obj/effect/clockwork/sigil/submission/accession prevent_path = /obj/effect/clockwork/sigil/submission @@ -30,8 +30,8 @@ Dead servants can be revived by this sigil if it has enough stored vitality." invocations = list("Divinity...", "...steal their life...", "...for these shells!") channel_time = 70 - required_components = list("belligerent_eye" = 1, "vanguard_cogwheel" = 3, "hierophant_ansible" = 1) - consumed_components = list("belligerent_eye" = 1, "vanguard_cogwheel" = 2, "hierophant_ansible" = 1) + required_components = list(BELLIGERENT_EYE = 1, VANGUARD_COGWHEEL = 3, HIEROPHANT_ANSIBLE = 1) + consumed_components = list(BELLIGERENT_EYE = 1, VANGUARD_COGWHEEL = 2, HIEROPHANT_ANSIBLE = 1) whispered = TRUE object_path = /obj/effect/clockwork/sigil/vitality creator_message = "A vitality matrix appears below you. It will drain life from non-servants and heal servants that cross it." @@ -51,8 +51,8 @@ and will gain Fatigue at an increasing rate as they grow farther away. At maximum Fatigue, the marauder is forced to return to you and will be unable to manifest until its Fatigue is at zero." invocations = list("Fright's will...", "...call forth...") channel_time = 100 - required_components = list("belligerent_eye" = 1, "vanguard_cogwheel" = 1, "guvax_capacitor" = 3) - consumed_components = list("belligerent_eye" = 1, "vanguard_cogwheel" = 1, "guvax_capacitor" = 2) + required_components = list(BELLIGERENT_EYE = 1, VANGUARD_COGWHEEL = 1, GUVAX_CAPACITOR = 3) + consumed_components = list(BELLIGERENT_EYE = 1, VANGUARD_COGWHEEL = 1, GUVAX_CAPACITOR = 2) usage_tip = "Marauders are useful as personal bodyguards and frontline warriors, although they do little damage." tier = SCRIPTURE_APPLICATION sort_priority = 3 @@ -117,8 +117,8 @@ and exceptional speed, though taking damage will temporarily slow it down." invocations = list("Call forth...", "...the soldiers of Armorer.") channel_time = 80 - required_components = list("belligerent_eye" = 1, "vanguard_cogwheel" = 1, "replicant_alloy" = 3) - consumed_components = list("belligerent_eye" = 1, "vanguard_cogwheel" = 1, "replicant_alloy" = 2) + required_components = list(BELLIGERENT_EYE = 1, VANGUARD_COGWHEEL = 1, REPLICANT_ALLOY = 3) + consumed_components = list(BELLIGERENT_EYE = 1, VANGUARD_COGWHEEL = 1, REPLICANT_ALLOY = 2) object_path = /obj/structure/destructible/clockwork/shell/fragment creator_message = "You form an anima fragment, a powerful soul vessel receptable." observer_message = "The slab disgorges a puddle of black metal that expands and forms into a strange shell!" @@ -134,8 +134,8 @@ desc = "Scribes a sigil beneath the invoker which stores power to power clockwork structures." invocations = list("Divinity...", "...power our creations!") channel_time = 70 - required_components = list("vanguard_cogwheel" = 1, "guvax_capacitor" = 1, "hierophant_ansible" = 3) - consumed_components = list("vanguard_cogwheel" = 1, "guvax_capacitor" = 1, "hierophant_ansible" = 2) + required_components = list(VANGUARD_COGWHEEL = 1, GUVAX_CAPACITOR = 1, HIEROPHANT_ANSIBLE = 3) + consumed_components = list(VANGUARD_COGWHEEL = 1, GUVAX_CAPACITOR = 1, HIEROPHANT_ANSIBLE = 2) whispered = TRUE object_path = /obj/effect/clockwork/sigil/transmission creator_message = "A sigil silently appears below you. It will automatically power clockwork structures adjecent to it." @@ -152,8 +152,8 @@ desc = "Creates a clockwork totem that sabotages nearby machinery and funnels drained power into nearby Sigils of Transmission or the area's APC." invocations = list("May this totem...", "...shroud the false suns!") channel_time = 80 - required_components = list("belligerent_eye" = 4, "replicant_alloy" = 1, "hierophant_ansible" = 1) - consumed_components = list("belligerent_eye" = 3, "replicant_alloy" = 1, "hierophant_ansible" = 1) + required_components = list(BELLIGERENT_EYE = 4, REPLICANT_ALLOY = 1, HIEROPHANT_ANSIBLE = 1) + consumed_components = list(BELLIGERENT_EYE = 3, REPLICANT_ALLOY = 1, HIEROPHANT_ANSIBLE = 1) object_path = /obj/structure/destructible/clockwork/powered/interdiction_lens creator_message = "You form an interdiction lens, which disrupts cameras and radios and drains power." observer_message = "A brass totem rises from the ground, a purple gem appearing in its center!" @@ -172,8 +172,8 @@ desc = "Creates a mechanized prism that will rapidly repair damage to clockwork creatures, converted cyborgs, and clockwork structures. Requires replicant alloy or power to function." invocations = list("May this prism...", "...mend our dents and scratches!") channel_time = 80 - required_components = list("vanguard_cogwheel" = 4, "guvax_capacitor" = 1, "replicant_alloy" = 1) - consumed_components = list("vanguard_cogwheel" = 3, "guvax_capacitor" = 1, "replicant_alloy" = 1) + required_components = list(VANGUARD_COGWHEEL = 4, GUVAX_CAPACITOR = 1, REPLICANT_ALLOY = 1) + consumed_components = list(VANGUARD_COGWHEEL = 3, GUVAX_CAPACITOR = 1, REPLICANT_ALLOY = 1) object_path = /obj/structure/destructible/clockwork/powered/mending_motor/prefilled creator_message = "You form a mending motor, which will consume power or replicant alloy to mend the wounds of mechanized servants." observer_message = "An onyx prism forms in midair and sprouts tendrils to support itself!" @@ -192,8 +192,8 @@ desc = "Creates a mania motor which will cause brain damage and hallucinations in nearby non-servant humans. It will also try to convert humans directly adjecent to the motor." invocations = list("May this transmitter...", "...break the will of all who oppose us!") channel_time = 80 - required_components = list("guvax_capacitor" = 4, "replicant_alloy" = 1, "hierophant_ansible" = 1) - consumed_components = list("guvax_capacitor" = 3, "replicant_alloy" = 1, "hierophant_ansible" = 1) + required_components = list(GUVAX_CAPACITOR = 4, REPLICANT_ALLOY = 1, HIEROPHANT_ANSIBLE = 1) + consumed_components = list(GUVAX_CAPACITOR = 3, REPLICANT_ALLOY = 1, HIEROPHANT_ANSIBLE = 1) object_path = /obj/structure/destructible/clockwork/powered/mania_motor creator_message = "You form a mania motor which will cause brain damage and hallucinations in nearby humans while active." observer_message = "A two-pronged machine rises from the ground!" @@ -212,8 +212,8 @@ desc = "Creates a tinkerer's daemon which can rapidly collect components. It will only function if it has sufficient power, is outnumbered by servants by a ratio of 5:1, and there is at least one existing cache." invocations = list("May this generator...", "...collect Engine parts that yet hold greatness!") channel_time = 80 - required_components = list("belligerent_eye" = 1, "guvax_capacitor" = 1, "replicant_alloy" = 4) - consumed_components = list("belligerent_eye" = 1, "guvax_capacitor" = 1, "replicant_alloy" = 3) + required_components = list(BELLIGERENT_EYE = 1, GUVAX_CAPACITOR = 1, REPLICANT_ALLOY = 4) + consumed_components = list(BELLIGERENT_EYE = 1, GUVAX_CAPACITOR = 1, REPLICANT_ALLOY = 3) object_path = /obj/structure/destructible/clockwork/powered/tinkerers_daemon creator_message = "You form a tinkerer's daemon which can rapidly collect components at a power cost." invokers_required = 2 @@ -244,8 +244,8 @@ desc = "Creates a clockwork obelisk that can broadcast messages over the Hierophant Network or open a Spatial Gateway to any living servant or clockwork obelisk." invocations = list("May this obelisk...", "...take us to all places!") channel_time = 80 - required_components = list("vanguard_cogwheel" = 1, "replicant_alloy" = 1, "hierophant_ansible" = 4) - consumed_components = list("vanguard_cogwheel" = 1, "replicant_alloy" = 1, "hierophant_ansible" = 3) + required_components = list(VANGUARD_COGWHEEL = 1, REPLICANT_ALLOY = 1, HIEROPHANT_ANSIBLE = 4) + consumed_components = list(VANGUARD_COGWHEEL = 1, REPLICANT_ALLOY = 1, HIEROPHANT_ANSIBLE = 3) object_path = /obj/structure/destructible/clockwork/powered/clockwork_obelisk creator_message = "You form a clockwork obelisk which can broadcast messages or produce Spatial Gateways." observer_message = "A brass obelisk appears handing in midair!" diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm index e76712f992e..1600fc21fb1 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm @@ -10,7 +10,7 @@ chant_invocations = list("Punish their blindness!", "Take time, make slow!") chant_amount = 15 chant_interval = 20 - required_components = list("belligerent_eye" = 1) + required_components = list(BELLIGERENT_EYE = 1) usage_tip = "Useful for crowd control in a populated area and disrupting mass movement." tier = SCRIPTURE_DRIVER sort_priority = 1 @@ -41,8 +41,8 @@ Cultists of Nar-Sie will be set on fire, though they will be stunned for half the time." invocations = list("Grant me the flames of Engine!") channel_time = 10 - required_components = list("belligerent_eye" = 2) - consumed_components = list("belligerent_eye" = 1) + required_components = list(BELLIGERENT_EYE = 2) + consumed_components = list(BELLIGERENT_EYE = 1) whispered = TRUE object_path = /obj/item/clothing/glasses/judicial_visor creator_message = "You form a judicial visor, which is capable of smiting the unworthy." @@ -60,7 +60,7 @@ Excessive absorption will cause unconsciousness." invocations = list("Shield me...", "...from darkness!") channel_time = 30 - required_components = list("vanguard_cogwheel" = 1) + required_components = list(VANGUARD_COGWHEEL = 1) usage_tip = "You cannot reactivate Vanguard while still shielded by it." tier = SCRIPTURE_DRIVER sort_priority = 3 @@ -83,8 +83,8 @@ desc = "Charges your slab with healing power, allowing you to convert all of a target Servant's brute and burn damage to half as much toxin damage." invocations = list("Mend the wounds of...", "...my inferior flesh.") channel_time = 30 - required_components = list("vanguard_cogwheel" = 2) - consumed_components = list("vanguard_cogwheel" = 1) + required_components = list(VANGUARD_COGWHEEL = 2) + consumed_components = list(VANGUARD_COGWHEEL = 1) usage_tip = "The Compromise is very fast to invoke, and will remove holy water from the target Servant." tier = SCRIPTURE_DRIVER sort_priority = 4 @@ -103,7 +103,7 @@ invocations = list("Divinity, grant me strength...", "...to enlighten the heathen!") whispered = TRUE channel_time = 20 - required_components = list("guvax_capacitor" = 1) + required_components = list(GUVAX_CAPACITOR = 1) usage_tip = "Is melee range and does not penetrate mindshield implants. Much more efficient than a Sigil of Submission at low Servant amounts." tier = SCRIPTURE_DRIVER sort_priority = 5 @@ -171,8 +171,8 @@ chant_invocations = list("Hostiles on my back!", "Enemies on my trail!", "Gonna try and shake my tail.", "Bogeys on my six!") chant_amount = 5 chant_interval = 10 - required_components = list("guvax_capacitor" = 2) - consumed_components = list("guvax_capacitor" = 1) + required_components = list(GUVAX_CAPACITOR = 2) + consumed_components = list(GUVAX_CAPACITOR = 1) usage_tip = "Useful for fleeing attackers, as few will be able to follow someone using this scripture." tier = SCRIPTURE_DRIVER sort_priority = 6 @@ -212,7 +212,7 @@ desc = "Creates a new clockwork slab." invocations = list("Metal, become greater!") channel_time = 10 - required_components = list("replicant_alloy" = 1) + required_components = list(REPLICANT_ALLOY = 1) whispered = TRUE usage_tip = "This is inefficient as a way to produce components, as the slab produced must be held by someone with no other slabs to produce components." tier = SCRIPTURE_DRIVER @@ -232,8 +232,8 @@ desc = "Forms a cache that can store an infinite amount of components. All caches are linked and will provide components to slabs." invocations = list("Constructing...", "...a cache!") channel_time = 50 - required_components = list("belligerent_eye" = 0, "vanguard_cogwheel" = 0, "guvax_capacitor" = 0, "replicant_alloy" = 2, "hierophant_ansible" = 0) - consumed_components = list("belligerent_eye" = 0, "vanguard_cogwheel" = 0, "guvax_capacitor" = 0, "replicant_alloy" = 1, "hierophant_ansible" = 0) + required_components = list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GUVAX_CAPACITOR = 0, REPLICANT_ALLOY = 2, HIEROPHANT_ANSIBLE = 0) + consumed_components = list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GUVAX_CAPACITOR = 0, REPLICANT_ALLOY = 1, HIEROPHANT_ANSIBLE = 0) object_path = /obj/structure/destructible/clockwork/cache creator_message = "You form a tinkerer's cache, which is capable of storing components, which will automatically be used by slabs." observer_message = "A hollow brass spire rises and begins to blaze!" @@ -245,10 +245,10 @@ /datum/clockwork_scripture/create_object/tinkerers_cache/New() var/cache_cost_increase = min(round(clockwork_caches*0.2), 5) for(var/i in required_components) - if(i != "replicant_alloy") + if(i != REPLICANT_ALLOY) required_components[i] += cache_cost_increase for(var/i in consumed_components) - if(i != "replicant_alloy") + if(i != REPLICANT_ALLOY) consumed_components[i] += cache_cost_increase return ..() @@ -260,7 +260,7 @@ desc = "Fabricates a pair of glasses that provides true sight but quickly damage vision, eventually causing blindness if worn for too long." invocations = list("Show the truth of this world to me!") channel_time = 10 - required_components = list("hierophant_ansible" = 1) + required_components = list(HIEROPHANT_ANSIBLE = 1) whispered = TRUE object_path = /obj/item/clothing/glasses/wraith_spectacles creator_message = "You form a pair of wraith spectacles, which will grant true sight when worn." @@ -277,8 +277,8 @@ desc = "Wards a tile with a sigil. The next person to cross the sigil will be smitten and unable to move. Nar-Sian cultists are stunned altogether." invocations = list("Divinity, dazzle...", "...those who tresspass here!") channel_time = 50 - required_components = list("hierophant_ansible" = 2) - consumed_components = list("hierophant_ansible" = 1) + required_components = list(HIEROPHANT_ANSIBLE = 2) + consumed_components = list(HIEROPHANT_ANSIBLE = 1) whispered = TRUE object_path = /obj/effect/clockwork/sigil/transgression creator_message = "A sigil silently appears below you. The next non-servant to cross it will be immobilized." diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_judgement.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_judgement.dm index eca17084448..3297fc80a44 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_judgement.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_judgement.dm @@ -12,8 +12,8 @@ "THE TIME HAS COME FOR OUR MASTER TO BREAK THE CHAINS OF EXILE!!", \ "LEND US YOUR AID! ENGINE COMES!!") channel_time = 150 - required_components = list("belligerent_eye" = 10, "vanguard_cogwheel" = 10, "guvax_capacitor" = 10, "replicant_alloy" = 10, "hierophant_ansible" = 10) - consumed_components = list("belligerent_eye" = 10, "vanguard_cogwheel" = 10, "guvax_capacitor" = 10, "replicant_alloy" = 10, "hierophant_ansible" = 10) + required_components = list(BELLIGERENT_EYE = 10, VANGUARD_COGWHEEL = 10, GUVAX_CAPACITOR = 10, REPLICANT_ALLOY = 10, HIEROPHANT_ANSIBLE = 10) + consumed_components = list(BELLIGERENT_EYE = 10, VANGUARD_COGWHEEL = 10, GUVAX_CAPACITOR = 10, REPLICANT_ALLOY = 10, HIEROPHANT_ANSIBLE = 10) invokers_required = 5 multiple_invokers_used = TRUE usage_tip = "The gateway is completely vulnerable to attack during its five-minute duration. It will periodically give indication of its general position to everyone on the station \ diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_revenant.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_revenant.dm index 79d69ef73c7..cd14ecde7ca 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_revenant.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_revenant.dm @@ -9,8 +9,8 @@ desc = "Taps the limitless power of Inath-neq, one of Ratvar's four generals. The benevolence of Inath-Neq will grant complete invulnerability to all servants in range for fifteen seconds." invocations = list("I call upon you, Vanguard!!", "Let the Resonant Cogs turn once more!!", "Grant me and my allies the strength to vanquish our foes!!") channel_time = 150 - required_components = list("vanguard_cogwheel" = 6, "guvax_capacitor" = 3, "replicant_alloy" = 3, "hierophant_ansible" = 3) - consumed_components = list("vanguard_cogwheel" = 6, "guvax_capacitor" = 3, "replicant_alloy" = 3, "hierophant_ansible" = 3) + required_components = list(VANGUARD_COGWHEEL = 6, GUVAX_CAPACITOR = 3, REPLICANT_ALLOY = 3, HIEROPHANT_ANSIBLE = 3) + consumed_components = list(VANGUARD_COGWHEEL = 6, GUVAX_CAPACITOR = 3, REPLICANT_ALLOY = 3, HIEROPHANT_ANSIBLE = 3) usage_tip = "Those affected by this scripture are only weak to things that outright destroy bodies, such as bombs or the singularity." tier = SCRIPTURE_REVENANT sort_priority = 2 @@ -45,8 +45,8 @@ clockwork proselytizers will cost no replicant alloy to use." invocations = list("I call upon you, Armorer!!", "Let your machinations reign on this miserable station!!", "Let your power flow through the tools of your master!!") channel_time = 150 - required_components = list("belligerent_eye" = 3, "vanguard_cogwheel" = 3, "guvax_capacitor" = 3, "replicant_alloy" = 6) - consumed_components = list("belligerent_eye" = 3, "vanguard_cogwheel" = 3, "guvax_capacitor" = 3, "replicant_alloy" = 6) + required_components = list(BELLIGERENT_EYE = 3, VANGUARD_COGWHEEL = 3, GUVAX_CAPACITOR = 3, REPLICANT_ALLOY = 6) + consumed_components = list(BELLIGERENT_EYE = 3, VANGUARD_COGWHEEL = 3, GUVAX_CAPACITOR = 3, REPLICANT_ALLOY = 6) usage_tip = "Ocular wardens will become empowered, clockwork proselytizers will require no alloy, tinkerer's daemons will produce twice as quickly, \ and interdiction lenses, mending motors, mania motors, tinkerer's daemons, and clockwork obelisks will all require no power." tier = SCRIPTURE_REVENANT @@ -102,8 +102,8 @@ for all non-servant humans on the same z-level as them. The power of this scripture falls off somewhat with distance, and certain things may reduce its effects." invocations = list("I call upon you, Fright!!", "Let your power shatter the sanity of the weak-minded!!", "Let your tendrils hold sway over all!!") channel_time = 150 - required_components = list("belligerent_eye" = 3, "vanguard_cogwheel" = 3, "guvax_capacitor" = 6, "hierophant_ansible" = 3) - consumed_components = list("belligerent_eye" = 3, "vanguard_cogwheel" = 3, "guvax_capacitor" = 6, "hierophant_ansible" = 3) + required_components = list(BELLIGERENT_EYE = 3, VANGUARD_COGWHEEL = 3, GUVAX_CAPACITOR = 6, HIEROPHANT_ANSIBLE = 3) + consumed_components = list(BELLIGERENT_EYE = 3, VANGUARD_COGWHEEL = 3, GUVAX_CAPACITOR = 6, HIEROPHANT_ANSIBLE = 3) usage_tip = "Causes brain damage, hallucinations, confusion, and dizziness in massive amounts." tier = SCRIPTURE_REVENANT sort_priority = 4 @@ -173,8 +173,8 @@ seconds, anyone near you will be struck by a devastating lightning bolt." invocations = list("I call upon you, Amperage!!", "Let your energy flow through me!!", "Let your boundless power shatter stars!!") channel_time = 150 - required_components = list("belligerent_eye" = 3, "guvax_capacitor" = 3, "replicant_alloy" = 3, "hierophant_ansible" = 6) - consumed_components = list("belligerent_eye" = 3, "guvax_capacitor" = 3, "replicant_alloy" = 3, "hierophant_ansible" = 6) + required_components = list(BELLIGERENT_EYE = 3, GUVAX_CAPACITOR = 3, REPLICANT_ALLOY = 3, HIEROPHANT_ANSIBLE = 6) + consumed_components = list(BELLIGERENT_EYE = 3, GUVAX_CAPACITOR = 3, REPLICANT_ALLOY = 3, HIEROPHANT_ANSIBLE = 6) usage_tip = "Struck targets will also be knocked down for about sixteen seconds." tier = SCRIPTURE_REVENANT sort_priority = 5 diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm index 21a198739d5..bf1e20f01c8 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm @@ -9,8 +9,8 @@ desc = "Forms an automatic short-range turret that deals low sustained damage to the unenlightened in its range." invocations = list("Guardians...", "...of the Engine...", "...defend us!") channel_time = 120 - required_components = list("belligerent_eye" = 2, "replicant_alloy" = 1) - consumed_components = list("belligerent_eye" = 1, "replicant_alloy" = 1) + required_components = list(BELLIGERENT_EYE = 2, REPLICANT_ALLOY = 1) + consumed_components = list(BELLIGERENT_EYE = 1, REPLICANT_ALLOY = 1) object_path = /obj/structure/destructible/clockwork/ocular_warden creator_message = "You form an ocular warden, which will focus its searing gaze upon nearby unenlightened." observer_message = "A brass eye takes shape and slowly rises into the air, its red iris glaring!" @@ -34,8 +34,8 @@ desc = "Creates a small shell fitted for soul vessels. Adding an active soul vessel to it results in a small construct with tools and an inbuilt proselytizer." invocations = list("Call forth...", "...the workers of Armorer.") channel_time = 60 - required_components = list("belligerent_eye" = 2, "hierophant_ansible" = 1) - consumed_components = list("belligerent_eye" = 1, "hierophant_ansible" = 1) + required_components = list(BELLIGERENT_EYE = 2, HIEROPHANT_ANSIBLE = 1) + consumed_components = list(BELLIGERENT_EYE = 1, HIEROPHANT_ANSIBLE = 1) object_path = /obj/structure/destructible/clockwork/shell/cogscarab creator_message = "You form a cogscarab, a constructor soul vessel receptable." observer_message = "The slab disgorges a puddle of black metal that contracts and forms into a strange shell!" @@ -52,8 +52,8 @@ It grows faster to invoke with more nearby servants." invocations = list("Shield me...", "...with the...", "... fragments of Engine!") channel_time = 110 //effectively 100 because it counts the invoker - required_components = list("vanguard_cogwheel" = 2, "replicant_alloy" = 1) - consumed_components = list("vanguard_cogwheel" = 1, "replicant_alloy" = 1) + required_components = list(VANGUARD_COGWHEEL = 2, REPLICANT_ALLOY = 1) + consumed_components = list(VANGUARD_COGWHEEL = 1, REPLICANT_ALLOY = 1) usage_tip = "Before using, advise adjacent allies to remove their helmets, external suits, gloves, and shoes." tier = SCRIPTURE_SCRIPT multiple_invokers_used = TRUE @@ -86,8 +86,8 @@ desc = "Places a luminous sigil that will enslave any valid beings standing on it after a time." invocations = list("Divinity, enlighten...", "...those who trespass here!") channel_time = 60 - required_components = list("belligerent_eye" = 1, "guvax_capacitor" = 2) - consumed_components = list("belligerent_eye" = 1, "guvax_capacitor" = 1) + required_components = list(BELLIGERENT_EYE = 1, GUVAX_CAPACITOR = 2) + consumed_components = list(BELLIGERENT_EYE = 1, GUVAX_CAPACITOR = 1) whispered = TRUE object_path = /obj/effect/clockwork/sigil/submission creator_message = "A luminous sigil appears below you. The next non-servant to cross it will be enslaved after a brief time if they do not move." @@ -104,8 +104,8 @@ desc = "Forms an ancient positronic brain with an overriding directive to serve Ratvar." invocations = list("Herd the souls of...", "...the blasphemous damned!") channel_time = 30 - required_components = list("vanguard_cogwheel" = 1, "guvax_capacitor" = 2) - consumed_components = list("vanguard_cogwheel" = 1, "guvax_capacitor" = 1) + required_components = list(VANGUARD_COGWHEEL = 1, GUVAX_CAPACITOR = 2) + consumed_components = list(VANGUARD_COGWHEEL = 1, GUVAX_CAPACITOR = 1) whispered = TRUE object_path = /obj/item/device/mmi/posibrain/soul_vessel creator_message = "You form a soul vessel, which can be used in-hand to attract spirits, or used on an unconscious or dead human to extract their consciousness." @@ -122,8 +122,8 @@ desc = "Forms a device that, when used on certain objects, converts them into their Ratvarian equivalents. It requires replicant alloys to function." invocations = list("With this device...", "...his presence shall be made known.") channel_time = 20 - required_components = list("guvax_capacitor" = 1, "replicant_alloy" = 2) - consumed_components = list("guvax_capacitor" = 1, "replicant_alloy" = 1) + required_components = list(GUVAX_CAPACITOR = 1, REPLICANT_ALLOY = 2) + consumed_components = list(GUVAX_CAPACITOR = 1, REPLICANT_ALLOY = 1) whispered = TRUE object_path = /obj/item/clockwork/clockwork_proselytizer/preloaded creator_message = "You form a clockwork proselytizer, which is already pre-loaded with a small amount of replicant alloy." @@ -141,8 +141,8 @@ vanish three minutes after being summoned." invocations = list("Grant me...", "...the might of brass!") channel_time = 20 - required_components = list("replicant_alloy" = 2, "hierophant_ansible" = 1) - consumed_components = list("replicant_alloy" = 1, "hierophant_ansible" = 1) + required_components = list(REPLICANT_ALLOY = 2, HIEROPHANT_ANSIBLE = 1) + consumed_components = list(REPLICANT_ALLOY = 1, HIEROPHANT_ANSIBLE = 1) whispered = TRUE usage_tip = "You can impale human targets with the spear by pulling them, then attacking. Throwing the spear at a mob will do massive damage and stun them, but break the spear." tier = SCRIPTURE_SCRIPT @@ -205,8 +205,8 @@ Each servant assisting in the invocation adds one additional use and four additional seconds to the gateway's uses and duration." invocations = list("Spatial Gateway...", "...activate!") channel_time = 80 - required_components = list("vanguard_cogwheel" = 1, "hierophant_ansible" = 2) - consumed_components = list("vanguard_cogwheel" = 1, "hierophant_ansible" = 1) + required_components = list(VANGUARD_COGWHEEL = 1, HIEROPHANT_ANSIBLE = 2) + consumed_components = list(VANGUARD_COGWHEEL = 1, HIEROPHANT_ANSIBLE = 1) multiple_invokers_used = TRUE multiple_invokers_optional = TRUE usage_tip = "This gateway is strictly one-way and will only allow things through the invoker's portal." @@ -249,8 +249,8 @@ chant_invocations = list("Draw charge to this shell!") chant_amount = 30 chant_interval = 10 - required_components = list("guvax_capacitor" = 1, "hierophant_ansible" = 2) - consumed_components = list("guvax_capacitor" = 1, "hierophant_ansible" = 1) + required_components = list(GUVAX_CAPACITOR = 1, HIEROPHANT_ANSIBLE = 2) + consumed_components = list(GUVAX_CAPACITOR = 1, HIEROPHANT_ANSIBLE = 1) usage_tip = "If standing on a Sigil of Transmission, will transfer power to it. Augumented limbs will also be healed unless above a very high threshhold." tier = SCRIPTURE_SCRIPT sort_priority = 10 diff --git a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_cache.dm b/code/game/gamemodes/clock_cult/clock_structures/tinkerers_cache.dm index 201b929501d..da026d0f272 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_cache.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/tinkerers_cache.dm @@ -69,10 +69,10 @@ /obj/structure/destructible/clockwork/cache/attack_hand(mob/user) if(!is_servant_of_ratvar(user)) return 0 - if(!clockwork_component_cache["replicant_alloy"]) + if(!clockwork_component_cache[REPLICANT_ALLOY]) user << "There is no Replicant Alloy in the global component cache!" return 0 - clockwork_component_cache["replicant_alloy"]-- + clockwork_component_cache[REPLICANT_ALLOY]-- var/obj/item/clockwork/component/replicant_alloy/A = new(get_turf(src)) user.visible_message("[user] withdraws [A] from [src].", "You withdraw [A] from [src].") user.put_in_hands(A) @@ -85,4 +85,4 @@ user << "It is linked and will generate components!" user << "Stored components:" for(var/i in clockwork_component_cache) - user << "[get_component_name(i)][i != "replicant_alloy" ? "s":""]: [clockwork_component_cache[i]]" + user << "[get_component_name(i)][i != REPLICANT_ALLOY ? "s":""]: [clockwork_component_cache[i]]" diff --git a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm b/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm index e15cf9eb1dd..e06701c01f1 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm @@ -31,7 +31,7 @@ if(is_servant_of_ratvar(user) || isobserver(user)) if(active) if(component_id_to_produce) - user << "It is currently producing [get_component_name(component_id_to_produce)][component_id_to_produce != "replicant_alloy" ? "s":""]." + user << "It is currently producing [get_component_name(component_id_to_produce)][component_id_to_produce != REPLICANT_ALLOY ? "s":""]." else user << "It is currently producing random components." user << "It will produce a component every [production_cooldown*0.1] seconds and requires at least the following power for each component type:"