tkdrg 77a6df36f7 Merge remote-tracking branch 'upstream/master' into moarfloors ...

Conflicts:
	_maps/map_files/MetaStation.v39K.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/machinery/bots/floorbot.dm

2014-11-14 15:23:35 -03:00

..

effects

Merge pull request #5877 from phil235/SmokeRuntimeFix

2014-11-14 18:09:19 +00:00

items

Merge remote-tracking branch 'upstream/master' into moarfloors

2014-11-14 15:23:35 -03:00

structures

bad placement for this particular line

2014-11-11 16:37:47 -08:00

empulse.dm

Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds)

2013-03-13 00:08:20 -03:00

explosion_recursive.dm

Explosion Optimizations

2014-01-04 19:29:17 -05:00

explosion.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

items.dm

Merge pull request #5591 from hornygranny/OOPgularity3

2014-11-03 20:20:55 -06:00

objs.dm

Fixes issue #1442

2014-11-05 13:55:31 -03:00

structures.dm

grilles are now damaged by thrown items

2014-10-31 18:26:42 -07:00

weapons.dm

Attack sounds for all melee weapons

2014-01-28 22:46:41 +13:00