Erthilo 3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm

2013-09-02 23:32:33 +01:00

..

holidays

tweaked, reworked and restructured a bunch of events, fixed the capitalisations issue in my repo structure

2013-02-10 21:22:02 +10:00

biomass.dm

Fully reverts clickdelay change.

2013-08-13 13:10:09 +01:00

black_hole.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

clang.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

dust.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

miniblob.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

ninja_abilities.dm

Cell.use checks instead of just minuses. Yay for code!

2013-09-01 00:16:11 +01:00

ninja_equipment.dm

Cell.use checks instead of just minuses. Yay for code!

2013-09-01 00:16:11 +01:00

PortalStorm.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

power_failure.dm

removed double announcement for grid checks

2013-03-06 01:31:40 +10:00

space_ninja.dm

Added two ears back.

2013-08-27 22:05:27 +01:00

spacevines.dm

fixed biomass/spacevine spawning, tweaked event probabilities, made aliens default to disabled as a random event

2013-02-14 23:17:54 +10:00

VirusEpidemic.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

wormholes.dm

-Now instead of just giving an angry message, any living mob with a client and the nuke disk that hits a transition on Z1 on them will have their momentum reversed, effectively sending them back where they came from. (Dead and clientless mobs still have the disk deleted from them)

2013-01-10 19:07:02 +00:00