diff --git a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/command.dm b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/command.dm index 679062d2a3..6e22297159 100644 --- a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/command.dm +++ b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/command.dm @@ -45,7 +45,7 @@ /datum/robot_sprite/dogborg/tall/command/fmeka name = "NIKA" - sprite_icon_state = "fmmekaunity" + sprite_icon_state = "fmekaunity" has_eye_light_sprites = TRUE has_custom_open_sprites = TRUE has_vore_belly_sprites = TRUE diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/spacecritters.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/spacecritters.dm index d47fa3dbb3..e8658abe3b 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/spacecritters.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/spacecritters.dm @@ -96,20 +96,21 @@ var/datum/gas_mixture/env = moth_loc.return_air() //Gets all the information on the local air. var/transfer_moles = 0.25 * env.total_moles //The bigger the room, the harder it is to heat the room. var/datum/gas_mixture/removed = env.remove(transfer_moles) - var/heat_transfer = removed.get_thermal_energy_change(set_temperature) - if(heat_transfer > 0 && env.temperature < T0C + 200) //This should start heating the room at a moderate pace up to 200 degrees celsius. - heat_transfer = min(heat_transfer , heating_power) //limit by the power rating of the heater - removed.add_thermal_energy(heat_transfer) + if(removed) + var/heat_transfer = removed.get_thermal_energy_change(set_temperature) + if(heat_transfer > 0 && env.temperature < T0C + 200) //This should start heating the room at a moderate pace up to 200 degrees celsius. + heat_transfer = min(heat_transfer , heating_power) //limit by the power rating of the heater + removed.add_thermal_energy(heat_transfer) - else if(heat_transfer > 0 && env.temperature < set_temperature) //Set temperature is 10,000 degrees celsius. So this thing will start cooking crazy hot between the temperatures of 200C and 10,000C. - heating_power = original_temp*100 //Changed to work variable -shark //FLAME ON! This will make the moth heat up the room at an incredible rate. - heat_transfer = min(heat_transfer , heating_power) //limit by the power rating of the heater. Except it's hot, so yeah. - removed.add_thermal_energy(heat_transfer) + else if(heat_transfer > 0 && env.temperature < set_temperature) //Set temperature is 10,000 degrees celsius. So this thing will start cooking crazy hot between the temperatures of 200C and 10,000C. + heating_power = original_temp*100 //Changed to work variable -shark //FLAME ON! This will make the moth heat up the room at an incredible rate. + heat_transfer = min(heat_transfer , heating_power) //limit by the power rating of the heater. Except it's hot, so yeah. + removed.add_thermal_energy(heat_transfer) - else - return + else + return - env.merge(removed) + env.merge(removed)