Chinsky be95e54e43 Merge branch 'master' into dev ...

Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-06-17 16:16:44 +04:00

..

devices

Merge with dev.

2014-06-12 01:14:40 +09:30

robot

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

stacks

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

2014-06-11 09:24:28 +09:30

weapons

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

apc_frame.dm

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

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

blueprints.dm

Replaces get_turf_loc() with get_turf()

2014-06-10 13:43:11 -04:00

bodybag.dm

Fixes bodybags not being able to be put back...

2014-05-22 16:44:26 -04:00

candle.dm

Various tiny improvements

2014-01-18 22:15:46 +01:00

contraband.dm

…

crayons.dm

Various tiny improvements

2014-01-18 22:15:46 +01:00

latexballoon.dm

Separates the sharp flag into edge and sharp

2014-06-15 20:25:39 -04:00

shooting_range.dm

Replaces get_turf_loc() with get_turf()

2014-06-10 13:43:11 -04:00

toys.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

trash.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00