Jordie0608 7719d8cb54 Merge branch 'master' of https://github.com/tgstation/-tg-station into arguablyallgunsareenergygunsandallbeamsareprojectiles ...

Conflicts:
	code/modules/projectiles/guns/energy/laser.dm

2015-12-11 15:59:46 +11:00

..

effects

Merge pull request #13463 from Incoming5643/a_placebo_effect

2015-12-08 22:08:25 -06:00

items

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

2015-12-11 15:59:46 +11:00

structures

Fixes #13418

2015-12-03 22:46:56 -05:00

buckling.dm

Fixes roller bed teleportation exploit

2015-11-16 22:30:26 -03:00

empulse.dm

Pooling is good for the soul.

2015-11-17 11:27:26 -05:00

explosion.dm

Fixes doppler arrays

2015-12-09 20:06:14 +01:00

items.dm

Merge pull request #13327 from KorPhaeron/reactive

2015-12-07 19:58:17 -06:00

objs.dm

Hopefully finally fixes the nanoui issue.

2015-12-06 23:24:01 -08:00

radiation.dm

Logging improvements

2015-11-13 18:08:23 -03:00

structures.dm

The blob eats nondense things in all cases.

2015-11-20 21:03:43 -05:00

weapons.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00