cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 11:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev

Browse Source
This commit is contained in:
Mloc-Argent
2014-06-23 20:57:47 +01:00
parent db248dbd84 17a45444cb
commit a33cb7272b
27 changed files with 41 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Susan/susan_desert_turfs.dm
+1 -1
View File
@@ -227,7 +227,7 @@ Alien plants should do something if theres a lot of poison
del(src)
/obj/effect/alien/flesh/weeds/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
/obj/effect/alien/flesh/weeds/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 300)
health -= 5
healthcheck()