From beb6dd6e0871af9917b8e3ea9723cd6f3fd5f14d Mon Sep 17 00:00:00 2001 From: Keate Senior Date: Mon, 20 Jul 2020 03:16:03 -0400 Subject: [PATCH] scripture changes and new marauder variant The Ark summoning scripture is being temporarily moved to applications until I can fix it not showing up in a new UI tab, as well as adds the Clockwork Guardian, a marauder variant that acts similar to holoparasites/guardian spirits in the sense that they're linked to a host. slower than normal marauders but with more health, they can automatically block and counter any melee attack, and heal their host up to a small amount if the host is heavily injured (65% health) --- code/__DEFINES/clockcult.dm | 4 +++- .../clock_scriptures/scripture_drivers.dm | 9 +++++---- .../clock_scriptures/scripture_judgement.dm | 10 +++++----- icons/mob/clockwork_mobs.dmi | Bin 26284 -> 26286 bytes tgstation.dme | 2 ++ 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/code/__DEFINES/clockcult.dm b/code/__DEFINES/clockcult.dm index 3e505d44b4..f84d69f109 100644 --- a/code/__DEFINES/clockcult.dm +++ b/code/__DEFINES/clockcult.dm @@ -20,7 +20,8 @@ GLOBAL_VAR_INIT(ark_of_the_clockwork_justiciar, FALSE) //The Ark on the Reebe z- GLOBAL_VAR_INIT(clockwork_gateway_activated, FALSE) //if a gateway to the celestial derelict has ever been successfully activated GLOBAL_VAR_INIT(script_scripture_unlocked, FALSE) //If script scripture is available, through converting at least one crewmember -GLOBAL_VAR_INIT(application_scripture_unlocked, FALSE) //If script scripture is available +GLOBAL_VAR_INIT(application_scripture_unlocked, FALSE) //If application scripture is available +GLOBAL_VAR_INIT(judgement_scripture_unlocked, FALSE) //If judgement scripture is available GLOBAL_LIST_EMPTY(all_scripture) //a list containing scripture instances; not used to track existing scripture //Scripture tiers and requirements; peripherals should never be used @@ -34,6 +35,7 @@ GLOBAL_LIST_EMPTY(all_scripture) //a list containing scripture instances; not us #define MAX_CLOCKWORK_POWER 80000 //The max power in W that the cult can stockpile #define SCRIPT_UNLOCK_THRESHOLD 35000 //Scripts will unlock if the total power reaches this amount #define APPLICATION_UNLOCK_THRESHOLD 50000 //Applications will unlock if the total power reaches this amount +#define JUDGEMENT_UNLOCK_THRESHOLD 80000 //clockcult power defines #define MIN_CLOCKCULT_POWER 25 //the minimum amount of power clockcult machines will handle gracefully diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm index 10eb82a749..95d3e8e78b 100644 --- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm +++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm @@ -191,6 +191,7 @@ Click your slab to cancel." +/*//commenting this out until its reworked to actually do random teleports //Abscond: Used to return to Reebe. /datum/clockwork_scripture/abscond descname = "Safety warp, teleports you somewhere random. moderately high power cost to use." @@ -212,7 +213,7 @@ /datum/clockwork_scripture/abscond/check_special_requirements() if(is_reebe(invoker.z)) - to_chat(invoker, "You're at Reebe.") + to_chat(invoker, "You're at Reebe, attempting to warp in the void could cause you to share your masters fate of banishment!.") return if(!isturf(invoker.loc)) to_chat(invoker, "You must be visible to warp!") @@ -236,8 +237,7 @@ playsound(invoker, 'sound/magic/magic_missile.ogg', 50, TRUE) playsound(T, 'sound/magic/magic_missile.ogg', 50, TRUE) do_sparks(5, TRUE, invoker) - do_sparks(5, TRUE, T) - if(invoker.client) + do_sparks(5, TRUE, T)*/ //Replicant: Creates a new clockwork slab. @@ -251,7 +251,7 @@ whispered = TRUE object_path = /obj/item/clockwork/slab creator_message = "You copy a piece of replicant alloy and command it into a new slab." - 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." + usage_tip = "This is inefficient as a way to produce power, as the slab produced must be held by someone with no other slabs to produce any." tier = SCRIPTURE_DRIVER space_allowed = TRUE primary_component = GEIS_CAPACITOR @@ -289,6 +289,7 @@ invocations = list("Spatial Gateway...", "...activate!") channel_time = 80 power_cost = 400 + whispered = TRUE 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." diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_judgement.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_judgement.dm index ff074b43b0..4a5557a58a 100644 --- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_judgement.dm +++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_judgement.dm @@ -1,5 +1,5 @@ /////////////// -// JUDGEMENT // For the big game changing things. Summonable generals soon, just need sprites for them. +// JUDGEMENT // For the big game changing things. TODO: Summonable generals, just need mob sprites for them. /////////////// //Ark of the Clockwork Justiciar: Creates a Gateway to the Celestial Derelict, summoning ratvar. @@ -12,15 +12,15 @@ "THE TIME HAS COME FOR OUR MASTER TO BREAK THE CHAINS OF EXILE!!", \ "LEND US YOUR AID! ENGINE COMES!!") channel_time = 150 - power_cost = 75000 //75 KW. It's literally the thing wrenching the god out of another dimension why wouldn't it be costly. + power_cost = 70000 //70 KW. It's literally the thing wrenching the god out of another dimension why wouldn't it be costly. invokers_required = 6 multiple_invokers_used = TRUE object_path = /obj/structure/destructible/clockwork/massive/celestial_gateway creator_message = "The Ark swirls into existance before you with the help of the Generals. After all this time, he shall, finally, be free" 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 \ as well as being loud enough to be heard throughout the entire sector. Defend it with your life!" - tier = SCRIPTURE_JUDGEMENT - sort_priority = 1 + tier = SCRIPTURE_APPLICATION + sort_priority = 6 /datum/clockwork_scripture/create_object/ark_of_the_clockwork_justiciar/check_special_requirements() if(!slab.no_cost) @@ -33,7 +33,7 @@ return FALSE var/area/A = get_area(invoker) var/turf/T = get_turf(invoker) - if(!T || !(T.z in GLOB.station_z_levels) || istype(A, /area/shuttle) || !A.blob_allowed) + if(!T || !is_station_level(T.z) || istype(A, /area/shuttle) || !A.blob_allowed) to_chat(invoker, "You must be on the station to activate the Ark!") return FALSE if(GLOB.clockwork_gateway_activated) diff --git a/icons/mob/clockwork_mobs.dmi b/icons/mob/clockwork_mobs.dmi index 5985adf12de9f819169937c6c3c2be475fb40fc8..54690f6cac2a5a6be729ecd15440ea50c5c2217c 100644 GIT binary patch delta 308 zcmV-40n7fZ%>k~>0gxnr8+ue&bVOxyV{&P5bZKvH004NLt4>2!X(+^D!-#0Q(Dn_Fx_WIXr|>AemOI_9Uyo%~D^pH8HFYDGjZu2!Y2690?#x1eIR(ONj2d~NoKoS{ zJg6t-CQTLk7mM#AyTi=zbOCH&1e%*GkiFaLUR^~T#)i77R zvru)7QKS1~esb`7aJda0AV2_H9si_4rwS1wL})4LR1y*r(o&IAMTig~vQ+F;F=E7s zEtNP`f&>W?OQlXGl_Euo)KZyKWyp{rv$yQK7v|&ph&`Qe1r^te_ym*V{=H}RA|A6w G0cK^3x{$d5 delta 306 zcmV-20nPrd%>k^<0gxnr8G2M$bVOxyV{&P5bZKvH004NLrP0f3!!Qs9(6#jyL$bXD zJC<#E;Z1NTStP$;RD1luFOc1a{CyWC7(u8?3(`U`=W2%8)9L(nxlw+-h)*_4H&2w2 zJov)9ch%ZbM&VI-Eq6`3em|B~uS^;3^wf=9)J8WWPwP&2Rc97|$|w+CZS=?sWu$~x z@t_}+k$*_=!`*VrVJ`doZ2Dr}O)ZBb$a_Hyv#C?@iILHovJWhq>&X zg}SSa9^D`FgM-&&%Wdoc0Rq_S_$L)QRfrHFLQ6@fl8}&)mWrGzLWBsBrDCUw5hF%y zsl=%gBuJ20N;#Dzf`WpwRO(bIQlv=jE&J|;`FI|&r}HhR{CW{z)A9Z9=n<^}vq%AE EWw)G`hyVZp diff --git a/tgstation.dme b/tgstation.dme index 78cce84a0c..e23f12e64c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -226,6 +226,7 @@ #include "code\_onclick\hud\alien_larva.dm" #include "code\_onclick\hud\blob_overmind.dm" #include "code\_onclick\hud\blobbernauthud.dm" +#include "code\_onclick\hud\clockwork_marauder.dm" #include "code\_onclick\hud\constructs.dm" #include "code\_onclick\hud\credits.dm" #include "code\_onclick\hud\devil.dm" @@ -1506,6 +1507,7 @@ #include "code\modules\antagonists\clockcult\clock_scriptures\scripture_applications.dm" #include "code\modules\antagonists\clockcult\clock_scriptures\scripture_cyborg.dm" #include "code\modules\antagonists\clockcult\clock_scriptures\scripture_drivers.dm" +#include "code\modules\antagonists\clockcult\clock_scriptures\scripture_judgement.dm" #include "code\modules\antagonists\clockcult\clock_scriptures\scripture_scripts.dm" #include "code\modules\antagonists\clockcult\clock_structures\_trap_object.dm" #include "code\modules\antagonists\clockcult\clock_structures\ark_of_the_clockwork_justicar.dm"