Neerti e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015 ...

Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme

2015-10-10 23:17:26 -04:00

..

ashtray.dm

Compile fix.

2015-06-20 23:14:09 +09:30

bats.dm

…

kitchen.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-11 10:58:49 +02:00

knives.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-14 08:21:12 +02:00

material_weapons.dm

Adds common proc to obtain the material of an object

2015-08-01 23:03:21 -04:00

misc.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-23 01:30:46 -04:00

shards.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-30 10:23:14 +02:00

swords.dm

Refactors duplicate parry code

2015-08-28 14:39:28 -04:00

thrown.dm

…

twohanded.dm

Mob size tweaks.

2015-09-20 17:12:07 +02:00

twohanded.dm.orig

…