PsiOmegaDelta 5cbb703609 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/_helpers/unsorted.dm
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/update_icons.dm
	code/modules/organs/organ.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/setup.dm

2015-07-27 10:20:20 +02:00

..

Academy.dm

Away Mission Tweaks:

2012-10-19 00:58:56 +00:00

Academy.dmm

Map changes.

2015-05-13 19:09:40 +01:00

arcticwaste.dmm

updated area on arcticwaste.dmm

2013-01-11 15:02:07 +10:00

assistantChamber.dmm

Fixed paths in away mission maps

2013-01-04 03:27:13 +04:00

beach.dmm

Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up.

2013-06-21 20:14:11 -07:00

blackmarketpackers.dmm

Map changes.

2015-05-13 19:09:40 +01:00

challenge.dm

-Changed emitters.

2012-12-30 10:47:25 +00:00

challenge.dmm

Map changes.

2015-05-13 19:09:40 +01:00

example.dmm

Map changes.

2015-05-13 19:09:40 +01:00

fileList.txt

examples for fileList.txt

2013-08-12 13:55:54 +01:00

jungle.dmm

add+fix missing files for jungle away mission, re-add missing atmos and security rigs, refactor and cleanup rigs

2013-01-14 23:29:53 +10:00

listeningpost.dmm

Map changes.

2015-05-13 19:09:40 +01:00

spacebattle.dmm

Removed the 'AnyColor' paint can from the spacebattle map, as the item definition was commented out.

2013-01-12 22:15:19 -08:00

stationCollision.dm

Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746

2013-01-08 19:11:56 +00:00

stationCollision.dmm

Bugfixes, removing the remnants of table_parts, changelog.

2015-05-13 20:40:00 +01:00

wildwest.dm

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

2015-07-27 10:20:20 +02:00

wildwest.dmm

-Changed emitters.

2012-12-30 10:47:25 +00:00

zresearchlabs.dmm

Bugfixes, removing the remnants of table_parts, changelog.

2015-05-13 20:40:00 +01:00