From bef154f4af6525a85a164e9541d2781bce753813 Mon Sep 17 00:00:00 2001 From: Simplehorror <101573582+Simplehorror@users.noreply.github.com> Date: Wed, 20 Apr 2022 14:34:23 +0100 Subject: [PATCH 1/5] Buffs integration cogs, they get double the power --- .../clockcult/clock_items/integration_cog.dm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/modules/antagonists/clockcult/clock_items/integration_cog.dm b/code/modules/antagonists/clockcult/clock_items/integration_cog.dm index 654f22535553..b2bfee46a01b 100644 --- a/code/modules/antagonists/clockcult/clock_items/integration_cog.dm +++ b/code/modules/antagonists/clockcult/clock_items/integration_cog.dm @@ -6,12 +6,14 @@ desc = "A small cogwheel that fits in the palm of your hand." clockwork_desc = "A small cogwheel that can be inserted into an open APC to siphon power from it passively.
\ It can be used on a locked APC to open its cover!
\ - Siphons 10 W of power per second while in a powered APC.
\ - Siphons 5 W of power per second while in an unpowered APC." + Siphons 20 W of power per second while in a powered APC.
\ + Siphons 10 W of power per second while in an unpowered APC." icon_state = "wall_gear" w_class = WEIGHT_CLASS_TINY item_flags = NOBLUDGEON var/obj/machinery/power/apc/apc + var/watts_per_second = 20 + var/depowered_multiplier = 0.5 /obj/item/clockwork/integration_cog/Initialize() . = ..() @@ -28,11 +30,13 @@ else STOP_PROCESSING(SSfastprocess, src) else + var/power_adjust = watts_per_second / 5 var/obj/item/stock_parts/cell/cell = apc.cell if(cell && (cell.charge / cell.maxcharge > COG_MAX_SIPHON_THRESHOLD)) cell.use(1) - adjust_clockwork_power(2) //Power is shared, so only do it once; this runs very quickly so it's about 10 W/second + adjust_clockwork_power(power_adjust) //Power is shared, so only do it once; this runs very quickly so it's about 10 W/second + else - adjust_clockwork_power(1) //Continue generating power when the cell has run dry; 5 W/second + adjust_clockwork_power(power_adjust * depowered_multiplier) //Continue generating power when the cell has run dry; 5 W/second #undef COG_MAX_SIPHON_THRESHOLD From 0c68669a3fef7599626c8d429a8931491bb0ae3a Mon Sep 17 00:00:00 2001 From: Simplehorror <101573582+Simplehorror@users.noreply.github.com> Date: Wed, 20 Apr 2022 14:39:43 +0100 Subject: [PATCH 2/5] Judicial visor now does 5 seconds stun, but it's a knockdown now --- .../modules/antagonists/clockcult/clock_items/judicial_visor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm index ee284bfc28f4..471dd062ba9d 100644 --- a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm +++ b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm @@ -196,7 +196,7 @@ L.visible_message(span_warning("Strange energy flows into [L]'s [I.name]!"), \ span_userdanger("Your [I.name] shields you from [src]!")) continue - L.Paralyze(15) //knocks down briefly when exploding + L.Knockdown(50) //knocks down briefly when exploding if(!iscultist(L)) L.visible_message(span_warning("[L] is struck by a judicial explosion!"), \ span_userdanger("[!issilicon(L) ? "An unseen force slams you into the ground!" : "ERROR: Motor servos disabled by external source!"]")) From 73705ce06e81bf697c1940e370e59a7a7722f181 Mon Sep 17 00:00:00 2001 From: Simplehorror <101573582+Simplehorror@users.noreply.github.com> Date: Wed, 20 Apr 2022 14:42:45 +0100 Subject: [PATCH 3/5] Increase the superheated wall limit to 30 --- code/__DEFINES/clockcult.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/clockcult.dm b/code/__DEFINES/clockcult.dm index 320027a3d94c..9fd1ca1db8b2 100644 --- a/code/__DEFINES/clockcult.dm +++ b/code/__DEFINES/clockcult.dm @@ -104,7 +104,7 @@ GLOBAL_LIST_EMPTY(all_scripture) //Eminence defines /// How many walls can be superheated at once -#define SUPERHEATED_CLOCKWORK_WALL_LIMIT 20 +#define SUPERHEATED_CLOCKWORK_WALL_LIMIT 30 //misc clockcult stuff @@ -136,4 +136,4 @@ GLOBAL_LIST_EMPTY(all_scripture) #define ARK_SCREAM_COOLDOWN 600 /// The percent of servant over living players before they enter hardmode and have a warp penalty on non-clockwork tiles -#define SERVANT_HARDMODE_PERCENT 0.2 \ No newline at end of file +#define SERVANT_HARDMODE_PERCENT 0.2 From df9b76278a27da609a1df322a5c247f852a06db7 Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sun, 24 Apr 2022 13:38:42 +0100 Subject: [PATCH 4/5] Update code/modules/antagonists/clockcult/clock_items/integration_cog.dm Co-authored-by: Theos --- .../antagonists/clockcult/clock_items/integration_cog.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/clockcult/clock_items/integration_cog.dm b/code/modules/antagonists/clockcult/clock_items/integration_cog.dm index b2bfee46a01b..5ec7e0637a72 100644 --- a/code/modules/antagonists/clockcult/clock_items/integration_cog.dm +++ b/code/modules/antagonists/clockcult/clock_items/integration_cog.dm @@ -33,7 +33,7 @@ var/power_adjust = watts_per_second / 5 var/obj/item/stock_parts/cell/cell = apc.cell if(cell && (cell.charge / cell.maxcharge > COG_MAX_SIPHON_THRESHOLD)) - cell.use(1) + cell.use(2) adjust_clockwork_power(power_adjust) //Power is shared, so only do it once; this runs very quickly so it's about 10 W/second else From b00ef3118dd4fa55d385b1fb0436fb876de6216e Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sun, 24 Apr 2022 13:39:31 +0100 Subject: [PATCH 5/5] Update code/modules/antagonists/clockcult/clock_items/judicial_visor.dm --- .../modules/antagonists/clockcult/clock_items/judicial_visor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm index 471dd062ba9d..ee284bfc28f4 100644 --- a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm +++ b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm @@ -196,7 +196,7 @@ L.visible_message(span_warning("Strange energy flows into [L]'s [I.name]!"), \ span_userdanger("Your [I.name] shields you from [src]!")) continue - L.Knockdown(50) //knocks down briefly when exploding + L.Paralyze(15) //knocks down briefly when exploding if(!iscultist(L)) L.visible_message(span_warning("[L] is struck by a judicial explosion!"), \ span_userdanger("[!issilicon(L) ? "An unseen force slams you into the ground!" : "ERROR: Motor servos disabled by external source!"]"))