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

Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs

Browse Source 
Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/modules/mob/mob_movement.dm
	code/modules/recycling/conveyor2.dm
This commit is contained in:
duncathan
2016-03-30 22:55:00 -06:00
parent 583181bc7a 1bc99f3ad7
commit eeb0119acb
35 changed files with 194 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/effect_system/effects_foam.dm
+4 -4
View File
@@ -12,7 +12,7 @@
var/amount = 3
animate_movement = 0
var/metal = 0
var/lifetime = 6
var/lifetime = 40
/obj/effect/particle_effect/foam/metal
@@ -29,16 +29,16 @@
/obj/effect/particle_effect/foam/New(loc)
..(loc)
create_reagents(1000) //limited by the size of the reagent holder anyway.
SSobj.processing |= src
SSfastprocess.processing |= src
playsound(src, 'sound/effects/bubbles2.ogg', 80, 1, -3)
/obj/effect/particle_effect/foam/Destroy()
SSobj.processing.Remove(src)
SSfastprocess.processing.Remove(src)
return ..()
/obj/effect/particle_effect/foam/proc/kill_foam()
SSobj.processing.Remove(src)
SSfastprocess.processing.Remove(src)
if(metal)
var/obj/structure/foamedmetal/M = new(src.loc)
M.metal = metal