shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

Browse Source
This commit is contained in:
LetterJay
2017-12-16 13:08:50 -06:00
committed by GitHub
parent 715960b324
commit 7af461539f
756 changed files with 10062 additions and 11368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers.dm
+4 -5
View File
@@ -80,7 +80,8 @@
..()
/obj/item/reagent_containers/fire_act(exposed_temperature, exposed_volume)
reagents.expose_temperature(exposed_temperature)
reagents.chem_temp += 30
reagents.handle_reactions()
..()
/obj/item/reagent_containers/throw_impact(atom/target)
@@ -127,8 +128,6 @@
/obj/item/reagent_containers/microwave_act(obj/machinery/microwave/M)
if(is_open_container())
reagents.expose_temperature(1000)
reagents.chem_temp = max(reagents.chem_temp, 1000)
reagents.handle_reactions()
..()
/obj/item/reagent_containers/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
reagents.expose_temperature(exposed_temperature)