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

..

decals

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

2012-10-05 22:21:26 +10:00

spawners

File restructuring: ohgodihopenothingbroke edition.

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

aliens.dm

-Larva grow a little faster (an extra growth per life) when on weeds or when breathing in plasma.

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

barsign.dm

added random barsigns. will add them to the map when we get closer to merging

2012-09-09 00:39:43 +10:00

biomass_rift.dm

More file structure stuff!

2012-08-26 03:32:58 +00:00

bump_teleporter.dm

- Updated ingame polling to allow for polls that ask for player-entered text. This allows for more complex answers than a pick from a list.

2012-10-07 21:08:23 +00:00

effect_system.dm

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

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

gibs.dm

More file structure stuff!

2012-08-26 03:32:58 +00:00

glowshroom.dm

New lighting, it's essentially just the old DAL system with a queue.

2012-08-25 16:06:57 +00:00

landmarks.dm

Commiting for Aranclanos

2012-10-07 22:18:29 +00:00

manifest.dm

Map and Animal fixes!

2012-08-29 22:59:53 +00:00

mines.dm

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

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

misc.dm

More file structuring.

2012-09-05 22:44:48 +00:00

overlays.dm

Preparations for reducing the number of processing machines at round-start. There are currently 8000 or so at round start, this was already pruned to 2800ish by doohl's stuff.

2012-09-02 20:32:01 +00:00

portals.dm

File restructuring!

2012-08-29 18:00:30 +00:00

signs.dm

- In answer to the ransom demands, added a plaque to the AI Upload room.

2012-09-30 20:20:23 +00:00

step_triggers.dm

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

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