cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clockwork rebalance (#13806)

Browse Source 
* Buffs integration cogs, they get double the power

* Judicial visor now does 5 seconds stun, but it's a knockdown now

* Increase the superheated wall limit to 30

* Update code/modules/antagonists/clockcult/clock_items/integration_cog.dm

Co-authored-by: Theos <theubernyan@gmail.com>

* Update code/modules/antagonists/clockcult/clock_items/judicial_visor.dm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
Co-authored-by: Theos <theubernyan@gmail.com>
This commit is contained in:
Simplehorror
2022-04-24 14:16:12 +01:00
committed by GitHub
parent ef5f28e32d
commit afdfe3c925
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/__DEFINES/clockcult.dm
View File

@@ -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
#define SERVANT_HARDMODE_PERCENT 0.2

14
code/modules/antagonists/clockcult/clock_items/integration_cog.dm
View File

@@ -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.<br>\
<span class='brass'>It can be used on a locked APC to open its cover!</span><br>\
<span class='brass'>Siphons <b>10 W</b> of power per second while in a powered APC.</span><br>\
<span class='brass'>Siphons <b>5 W</b> of power per second while in an unpowered APC.</span>"
<span class='brass'>Siphons <b>20 W</b> of power per second while in a powered APC.</span><br>\
<span class='brass'>Siphons <b>10 W</b> of power per second while in an unpowered APC.</span>"
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
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
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