diff --git a/code/__DEFINES/~skyrat_defines/apc_defines.dm b/code/__DEFINES/~skyrat_defines/apc_defines.dm index d969b94a149..a79fa4ee286 100644 --- a/code/__DEFINES/~skyrat_defines/apc_defines.dm +++ b/code/__DEFINES/~skyrat_defines/apc_defines.dm @@ -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 diff --git a/code/modules/power/apc/apc_main.dm b/code/modules/power/apc/apc_main.dm index 6bc584bc4a3..871906fe4b8 100644 --- a/code/modules/power/apc/apc_main.dm +++ b/code/modules/power/apc/apc_main.dm @@ -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 diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 0bb458ffce4..b37e81574ff 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -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) diff --git a/modular_skyrat/master_files/code/modules/power/smes.dm b/modular_skyrat/master_files/code/modules/power/smes.dm deleted file mode 100644 index d4a504000c3..00000000000 --- a/modular_skyrat/master_files/code/modules/power/smes.dm +++ /dev/null @@ -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 diff --git a/modular_skyrat/modules/apc_arcing/code/apc.dm b/modular_skyrat/modules/apc_arcing/code/apc.dm index e1e3aca619f..6b6fd71404b 100644 --- a/modular_skyrat/modules/apc_arcing/code/apc.dm +++ b/modular_skyrat/modules/apc_arcing/code/apc.dm @@ -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 diff --git a/tgstation.dme b/tgstation.dme index 63be5901b9f..0e64fd92852 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -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"