Perakp 48b1ee513e Merge remote-tracking branch 'upstream/master' into wormholeProjector ...

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2014-11-29 09:37:40 +02:00

..

effects

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

2014-11-29 09:37:40 +02:00

items

Merge pull request #6107 from tkdrg/runtimesfuntimes

2014-11-28 16:35:01 -08:00

structures

Merge pull request #6119 from Intigracy/recursivebyebye

2014-11-28 16:33:30 -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.dm

Removes the unused explosion_recursive.dm and everything related to it, including the configuration option.

2014-11-27 14:28:20 -08:00

items.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour

2014-11-27 15:30:37 +03:00

objs.dm

Unwinded most of shit

2014-11-19 21:36:45 +03:00

structures.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour

2014-11-19 21:37:06 +03:00

weapons.dm

Attack sounds for all melee weapons

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