PsiOmega e48fbdd1e6 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm

2015-08-21 20:27:48 +02:00

..

chem

Fixes #10150

2015-07-13 11:44:47 +03:00

decals

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +02:00

spawners

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

aliens.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

bump_teleporter.dm

…

effect_system.dm

Moves flags values to item_flags var

2015-08-18 17:18:25 -04:00

explosion_particles.dm

Explosion particle GC.

2015-08-09 12:35:07 +02:00

gibs.dm

…

glowshroom.dm

…

landmarks.dm

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

2015-06-22 16:59:19 +02:00

manifest.dm

…

mines.dm

…

misc.dm

…

overlays.dm

…

portals.dm

…

spiders.dm

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

2015-06-26 20:28:47 +02:00

step_triggers.dm

…