Mloc-Argent e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

2014-05-03 16:56:19 +01:00

..

simulated

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

2014-05-03 16:56:19 +01:00

space

turfs: fix some playsound ERRORs on areas

2014-04-27 15:06:42 +01:00

unsimulated

Fix for #3549.

2013-08-19 13:05:00 +03:00

simulated.dm

turfs: fix some playsound ERRORs on areas

2014-04-27 15:06:42 +01:00

turf.dm

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07:00

unsimulated.dm

File restructuring: ohgodihopenothingbroke edition.

2012-09-08 22:11:02 +00:00