Zuhayr 5ec489aef5 Added a colour selector to the floor painter, added the floor painter to the construction and drone modules. ...

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

2016-01-02 12:23:30 +01:00

..

devices

Added a colour selector to the floor painter, added the floor painter to the construction and drone modules.

2016-01-02 12:23:30 +01:00

robot

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

2015-12-13 10:47:33 +01:00

stacks

Fixes subcategories of floor tiles not being placable

2015-12-11 11:08:36 +01:00

weapons

Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis

2016-01-01 23:58:29 -05:00

apc_frame.dm

…

blueprints.dm

…

bodybag.dm

…

contraband.dm

…

crayons.dm

…

glassjar.dm

…

latexballoon.dm

…

paintkit.dm

…

shooting_range.dm

…

toys.dm

fix issues with indented absolute path definitions

2015-12-09 14:12:54 +00:00

trash.dm

…