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
This commit is contained in:
Zuhayr
2016-01-02 12:23:30 +01:00
committed by PsiOmegaDelta
parent 979a120411
commit 5ec489aef5
2 changed files with 19 additions and 55 deletions
@@ -334,6 +334,7 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/weapon/pickaxe/plasmacutter(src)
src.modules += new /obj/item/device/pipe_painter(src)
src.modules += new /obj/item/weapon/gripper/no_use/loader(src)
src.modules += new /obj/item/device/floor_painter(src)
var/datum/matter_synth/metal = new /datum/matter_synth/metal()
var/datum/matter_synth/plasteel = new /datum/matter_synth/plasteel()
@@ -374,6 +375,7 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/device/analyzer(src)
src.modules += new /obj/item/taperoll/engineering(src)
src.modules += new /obj/item/weapon/gripper(src)
src.modules += new /obj/item/device/lightreplacer(src)
src.modules += new /obj/item/device/pipe_painter(src)
src.modules += new /obj/item/weapon/inflatable_dispenser(src)
src.emag = new /obj/item/borg/stun(src)
@@ -702,6 +704,8 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/weapon/soap(src)
src.modules += new /obj/item/weapon/gripper/no_use/loader(src)
src.modules += new /obj/item/weapon/extinguisher(src)
src.modules += new /obj/item/device/pipe_painter(src)
src.modules += new /obj/item/device/floor_painter(src)
robot.internals = new/obj/item/weapon/tank/jetpack/carbondioxide(src)
src.modules += robot.internals