cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into laptop

Browse Source
This commit is contained in:
DJSnapshot
2014-06-23 15:06:02 -07:00
parent c007b013d0 a33cb7272b
commit 7a3bee3823
67 changed files with 647 additions and 751 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()