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

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/modules/mob/mob_movement.dm
	code/modules/recycling/conveyor2.dm

2016-03-30 22:55:00 -06:00

..

effect_system.dm

Replaces holo tape and holo tape projector with holo barrier and holo barrier projector (children of the janitor's holosign creator).

2016-02-19 02:34:57 +01:00

effects_explosion.dm

derp

2015-10-21 23:48:23 +02:00

effects_foam.dm

AAAAAAAAAAAAAAAAA

2016-03-27 12:04:33 -07:00

effects_other.dm

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

effects_smoke.dm

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

effects_sparks.dm

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

effects_water.dm

Replaces holo tape and holo tape projector with holo barrier and holo barrier projector (children of the janitor's holosign creator).

2016-02-19 02:34:57 +01:00