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

aaaaaa (#19566)

Browse Source
This commit is contained in:
SapphicOverload
2023-07-10 19:03:27 -04:00
committed by GitHub
parent f35a487d9f
commit 0948ad7dca
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/atmospherics/machinery/components/fusion/hfr_defines.dm
View File

@@ -140,15 +140,26 @@
// //
// Explosion flags for use in fuel recipes // Explosion flags for use in fuel recipes
// //
/// Causes a light explosion on meltdown
#define HYPERTORUS_FLAG_BASE_EXPLOSION (1<<0) #define HYPERTORUS_FLAG_BASE_EXPLOSION (1<<0)
/// Causes a heavy explosion on meltdown
#define HYPERTORUS_FLAG_MEDIUM_EXPLOSION (1<<1) #define HYPERTORUS_FLAG_MEDIUM_EXPLOSION (1<<1)
/// Causes a devastating explosion on meltdown
#define HYPERTORUS_FLAG_DEVASTATING_EXPLOSION (1<<2) #define HYPERTORUS_FLAG_DEVASTATING_EXPLOSION (1<<2)
/// Causes a radiation pulse on meltdown
#define HYPERTORUS_FLAG_RADIATION_PULSE (1<<3) #define HYPERTORUS_FLAG_RADIATION_PULSE (1<<3)
/// Causes an EMP on meltdown
#define HYPERTORUS_FLAG_EMP (1<<4) #define HYPERTORUS_FLAG_EMP (1<<4)
/// Small radiation/EMP radius
#define HYPERTORUS_FLAG_MINIMUM_SPREAD (1<<5) #define HYPERTORUS_FLAG_MINIMUM_SPREAD (1<<5)
/// Medium radiation/EMP radius
#define HYPERTORUS_FLAG_MEDIUM_SPREAD (1<<6) #define HYPERTORUS_FLAG_MEDIUM_SPREAD (1<<6)
/// Large radiation/EMP radius
#define HYPERTORUS_FLAG_BIG_SPREAD (1<<7) #define HYPERTORUS_FLAG_BIG_SPREAD (1<<7)
/// Very large radiation/EMP radius
#define HYPERTORUS_FLAG_MASSIVE_SPREAD (1<<8) #define HYPERTORUS_FLAG_MASSIVE_SPREAD (1<<8)
/// Doubles explosion size and radiation/EMP radius
#define HYPERTORUS_FLAG_CRITICAL_MELTDOWN (1<<9) #define HYPERTORUS_FLAG_CRITICAL_MELTDOWN (1<<9)
///High power damage ///High power damage

4
code/modules/atmospherics/machinery/components/fusion/hfr_main_processes.dm
View File

@@ -237,8 +237,8 @@
*/ */
/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/moderator_fuel_process(delta_time, production_amount, consumption_amount, datum/gas_mixture/internal_output, moderator_list, datum/hfr_fuel/fuel, fuel_list) /obj/machinery/atmospherics/components/unary/hypertorus/core/proc/moderator_fuel_process(delta_time, production_amount, consumption_amount, datum/gas_mixture/internal_output, moderator_list, datum/hfr_fuel/fuel, fuel_list)
// Adjust fusion consumption/production based on this recipe's characteristics // Adjust fusion consumption/production based on this recipe's characteristics
var/fuel_consumption = consumption_amount * 0.85 * selected_fuel.fuel_consumption_multiplier var/fuel_consumption = consumption_amount * 0.85 * selected_fuel.fuel_consumption_multiplier * max(power_level, 1)
var/scaled_production = production_amount * selected_fuel.gas_production_multiplier var/scaled_production = production_amount * selected_fuel.gas_production_multiplier * max(power_level, 1)
for(var/gas_id in fuel.requirements) for(var/gas_id in fuel.requirements)
internal_fusion.adjust_moles(gas_id, -min(fuel_list[gas_id], fuel_consumption)) internal_fusion.adjust_moles(gas_id, -min(fuel_list[gas_id], fuel_consumption))