Cael_Aislinn 419247adfe Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport ...

Conflicts:
	baystation12.dme
	code/game/verbs/ooc.dm
	code/modules/admin/admin_verbs.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html

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

2012-10-12 17:53:17 +10:00

..

maploader

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)

2012-09-04 22:19:03 +10:00

bluespaceartillery.dm

Committing my mostly finished away mission.

2012-10-12 06:05:52 +00:00

corpse.dm

Committing my mostly finished away mission.

2012-10-12 06:05:52 +00:00

gateway.dm

Split the gateway/center into two objects, stationcenter and stationaway. The gates actually search for and detect eachother, and warp to eachother (suck it Pete)

2012-09-18 05:59:36 +00:00

loot.dm

More work on away missions. They're almost playable now.

2012-09-08 23:50:54 +00:00

pamphlet.dm

Updoot for away missions. Nothing big.

2012-09-09 19:06:38 +00:00

trigger.dm

Committing work on away missions.

2012-09-02 23:58:11 +00:00

zlevel.dm

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-09-22 21:29:04 +10:00