PsiOmegaDelta 9698def0e7 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/nano/modules/human_appearance.dm

2015-06-22 16:59:19 +02:00

..

devices

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

robot

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

stacks

Fixes #9777

2015-06-10 23:14:34 +09:30

weapons

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

2015-06-22 16:59:19 +02:00

apc_frame.dm

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

2015-06-08 09:57:33 +02:00

blueprints.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

bodybag.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

contraband.dm

…

crayons.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

glassjar.dm

…

latexballoon.dm

…

paintkit.dm

…

shooting_range.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

toys.dm

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

trash.dm

…