Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "hotspot_expose() will now heat the turf's air if it fails to create a hotspot" #38217

Merged
merged 2 commits into from
Jun 2, 2018
Merged

Revert "hotspot_expose() will now heat the turf's air if it fails to create a hotspot" #38217

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
553a7a4
Merge pull request #1 from tgstation/master
Winterous Jun 1, 2018
2b44067
Update LINDA_fire.dm
Winterous Jun 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 1 addition & 6 deletions code/modules/atmospherics/environmental/LINDA_fire.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@
active_hotspot.just_spawned = (current_cycle < SSair.times_fired)
//remove just_spawned protection if no longer processing this cell
SSair.add_to_active(src, 0)
else
var/datum/gas_mixture/heating = air_contents.remove_ratio(exposed_volume/air_contents.volume)
heating.temperature = exposed_temperature
heating.react()
assume_air(heating)
return igniting

//This is the icon for fire on turfs, also helps for nurturing small fires until they are full tile
Expand Down Expand Up @@ -261,4 +256,4 @@
. = ..()
if(!isliving(loc))
return INITIALIZE_HINT_QDEL
#undef INSUFFICIENT
#undef INSUFFICIENT