PsiOmega d14904e1d6 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/response_team.dm
	code/modules/hydroponics/spreading/spreading.dm
	code/modules/mob/dead/observer/observer.dm

2015-05-11 09:28:59 +02:00

..

observer

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

2015-05-11 09:28:59 +02:00

death.dm

TG: Fixed dust() and gib() leaving invisible overlays everywhere

2012-05-06 18:50:52 +01:00