Mloc-Hibernia 281a26b979 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm

2014-07-18 13:08:12 +00:00

..

devices

Merging robot_modules.dm and master controller setup.

2014-07-14 09:10:02 +09:30

robot

Merge branch 'master' into dev

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

stacks

Merge pull request #5554 from Baystation12/master

2014-07-09 23:00:04 -07:00

weapons

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

2014-07-18 13:08:12 +00:00

apc_frame.dm

…

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

…

contraband.dm

…

crayons.dm

…

latexballoon.dm

Fixes FEA temperature_expose() being used...

2014-06-22 00:13:22 -04:00

shooting_range.dm

Replaces get_turf_loc() with get_turf()

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

toys.dm

Merge pull request #5277 from Jarcolr/dev

2014-06-20 09:02:03 +04:00

trash.dm

…