cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 15:17:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

more mistakes fixed

Browse Source
This commit is contained in:
phil235
2016-09-27 23:22:03 +02:00
parent 20af3ea260
commit 7c6c99683d
6 changed files with 37 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/objs.dm
+7 -8
View File
@@ -190,14 +190,13 @@
return T.storage_contents_dump_act(src_object, user)
/obj/fire_act(global_overlay=1)
if(!qdeleted(src))
if(!(resistance_flags & FIRE_PROOF))
resistance_flags |= ON_FIRE
SSobj.burning += src
burn_world_time = world.time + burntime*rand(10,20)
if(global_overlay)
add_overlay(fire_overlay)
return 1
if(!(resistance_flags & (FIRE_PROOF|ON_FIRE)))
resistance_flags |= ON_FIRE
SSobj.burning += src
burn_world_time = world.time + burntime*rand(10,20)
if(global_overlay)
add_overlay(fire_overlay)
return 1
/obj/proc/burn()
empty_object_contents(1, src.loc)