Mloc-Argent 6630e4838e Merge remote-tracking branch 'upstream/master' into dev-freeze ...

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

Conflicts:
	code/game/machinery/alarm.dm

2014-06-30 23:44:46 +01:00

..

devices

Merge pull request #5332 from mwerezak/wound-infections

2014-06-24 05:32:47 +04:00

robot

Merge branch 'master' into dev

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

stacks

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

2014-06-23 20:57:47 +01:00

weapons

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

2014-06-30 23:44:46 +01: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

…