cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 04:26:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

APC/SMES updates [NO GBP] (#28980)

Browse Source 
power updates
This commit is contained in:
lessthanthree
2024-07-22 18:28:09 +02:00
committed by GitHub
parent 2c8460b528
commit deb2fbe110
6 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/~skyrat_defines/apc_defines.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/// Lower excess value for APC arcing, 5% chance to arc
#define APC_ARC_LOWERLIMIT 4 MEGA WATTS
/// Moderate excess value for APC arcing, 10% chance to arc
#define APC_ARC_MEDIUMLIMIT 7 MEGA WATTS
#define APC_ARC_MEDIUMLIMIT 5.5 MEGA WATTS
/// Upper excess value for for APC arcing, 15% chance to arc
#define APC_ARC_UPPERLIMIT 9 MEGA WATTS
#define APC_ARC_UPPERLIMIT 7 MEGA WATTS
code/modules/power/apc/apc_main.dm
+2 -2
View File
@@ -8,9 +8,9 @@
///Cap for how fast cells charge, as a percentage per second (.01 means cellcharge is capped to 1% per second)
#define CHARGELEVEL 0.01
///Charge percentage at which the lights channel stops working
#define APC_CHANNEL_LIGHT_TRESHOLD 7 //SKYRAT EDIT CHANGE - Original: 15
#define APC_CHANNEL_LIGHT_TRESHOLD 10 //SKYRAT EDIT CHANGE - Original: 15
///Charge percentage at which the equipment channel stops working
#define APC_CHANNEL_EQUIP_TRESHOLD 17 //SKYRAT EDIT CHANGE - Original: 30
#define APC_CHANNEL_EQUIP_TRESHOLD 20 //SKYRAT EDIT CHANGE - Original: 30
///Charge percentage at which the APC icon indicates discharging
#define APC_CHANNEL_ALARM_TRESHOLD 75
code/modules/power/smes.dm
+11 -1
View File
@@ -69,7 +69,17 @@
var/max_charge = 0
var/new_charge = 0
for(var/datum/stock_part/capacitor/capacitor in component_parts)
power_coefficient += capacitor.tier
// SKYRAT EDIT CHANGE START - Original: power_coefficient += capacitor.tier
switch(capacitor.tier)
if(1)
power_coefficient = 1
if(2)
power_coefficient = 2
if(3)
power_coefficient = 4
else
power_coefficient = 8
// SKYRAT EDIT CHANGE END
input_level_max = initial(input_level_max) * power_coefficient
output_level_max = initial(output_level_max) * power_coefficient
for(var/obj/item/stock_parts/power_store/power_cell in component_parts)
modular_skyrat/master_files/code/modules/power/smes.dm
-8
View File
@@ -1,8 +0,0 @@
// TG power bad, SMES power update good
// Doubles output ability for input/output to allow for higher power generation passthrough without needing to build more SMES or hotwire
/obj/machinery/power/smes
capacity = 75 * STANDARD_BATTERY_CHARGE
input_level = 75 KILO WATTS
input_level_max = 400 KILO WATTS
output_level = 75 KILO WATTS
output_level_max = 400 KILO WATTS
modular_skyrat/modules/apc_arcing/code/apc.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/machinery/power/apc
/// Has the APC been protected against arcing?
var/arc_shielded = TRUE
var/arc_shielded = FALSE
/// Should we be forcing arcing, assuming there isn't arc shielding?
var/force_arcing = FALSE
tgstation.dme
-1
View File
@@ -6791,7 +6791,6 @@
#include "modular_skyrat\master_files\code\modules\paperwork\stamps.dm"
#include "modular_skyrat\master_files\code\modules\power\cable.dm"
#include "modular_skyrat\master_files\code\modules\power\circulator.dm"
#include "modular_skyrat\master_files\code\modules\power\smes.dm"
#include "modular_skyrat\master_files\code\modules\power\thermoelectric_generator.dm"
#include "modular_skyrat\master_files\code\modules\power\lighting\light_mapping_helpers.dm"
#include "modular_skyrat\master_files\code\modules\power\singularity\containment_field.dm"