Cael_Aislinn 7efc1aafef Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	icons/turf/areas.dmi
	maps/RandomZLevels/stationCollision.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2013-01-07 22:26:24 +10:00

..

Academy.dm

Away Mission Tweaks:

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

Academy.dmm

Fixed paths in away mission maps

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

arcticwaste.dmm

Removed /obj/effect/deskclutter at last.

2012-11-25 19:58:28 +00:00

assistantChamber.dmm

Fixed paths in away mission maps

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

beach.dmm

Put the sandals in beach.dmm in crates.

2012-11-16 10:32:10 +00:00

blackmarketpackers.dmm

Put in a bunch of missing windows on the space battle map.

2012-11-23 01:09:54 +00:00

challenge.dm

Accidentally left files out of the last commit.

2012-11-22 08:18:50 +00:00

challenge.dmm

Ported syndicates over to hostile simple animals.

2012-11-24 14:17:42 +00:00

example.dmm

Fixed paths in away mission maps

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

fileList.txt

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

listeningpost.dmm

Updated listeningpost.dmm to look nicer and be a bit more interesting.

2012-11-24 17:38:24 +00:00

spacebattle.dmm

Ported syndicates over to hostile simple animals.

2012-11-24 14:17:42 +00:00

stationCollision.dm

Added Exile Implants.

2012-11-20 14:34:29 +00:00

stationCollision.dmm

Got rid of evac part lights. No fun allowed.

2013-01-06 12:09:23 +04:00

wildwest.dm

-Changed the Resurrection "verb" to a "proc" so that nobody starts with it.

2012-11-21 21:27:12 +00:00

wildwest.dmm

Ported syndicates over to hostile simple animals.

2012-11-24 14:17:42 +00:00

zresearchlabs.dmm

Got rid of evac part lights. No fun allowed.

2013-01-06 12:09:23 +04:00