From 0ed8ee9b194af1c90523ff266fd983fa11d23498 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 2 Jun 2014 23:05:37 -0400 Subject: [PATCH] Readds flashes to all robots except drones. Drones also get a special low-power flashlight, now. --- code/game/objects/items/devices/flashlight.dm | 11 ++++++++++- .../mob/living/silicon/robot/robot_modules.dm | 15 ++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 59919346bde..4e504329787 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -110,6 +110,15 @@ flags = FPRINT | TABLEPASS | CONDUCT brightness_on = 2 +/obj/item/device/flashlight/drone + name = "low-power flashlight" + desc = "A miniature lamp, that might be used by small robots." + icon_state = "penlight" + item_state = "" + flags = FPRINT | TABLEPASS | CONDUCT + brightness_on = 2 + w_class = 1 + // the desk lamps are a bit special /obj/item/device/flashlight/lamp @@ -195,4 +204,4 @@ user.visible_message("[user] activates the flare.", "You pull the cord on the flare, activating it!") src.force = on_damage src.damtype = "fire" - processing_objects += src \ No newline at end of file + processing_objects += src diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index cebb57110b4..84740eb0ee2 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -62,7 +62,8 @@ New() - ..() + src.modules += new /obj/item/device/flashlight(src) + src.modules += new /obj/item/device/flash(src) src.modules += new /obj/item/borg/sight/hud/med(src) src.modules += new /obj/item/device/healthanalyzer(src) src.modules += new /obj/item/device/reagent_scanner/adv(src) @@ -85,6 +86,7 @@ New() src.modules += new /obj/item/device/flashlight(src) + src.modules += new /obj/item/device/flash(src) src.modules += new /obj/item/borg/sight/meson(src) src.emag = new /obj/item/borg/stun(src) src.modules += new /obj/item/weapon/rcd/borg(src) @@ -137,6 +139,7 @@ New() src.modules += new /obj/item/device/flashlight(src) + src.modules += new /obj/item/device/flash(src) src.modules += new /obj/item/borg/sight/hud/sec(src) src.modules += new /obj/item/weapon/handcuffs/cyborg(src) src.modules += new /obj/item/weapon/melee/baton(src) @@ -152,6 +155,7 @@ New() src.modules += new /obj/item/device/flashlight(src) + src.modules += new /obj/item/device/flash(src) src.modules += new /obj/item/weapon/soap/nanotrasen(src) src.modules += new /obj/item/weapon/storage/bag/trash(src) src.modules += new /obj/item/weapon/mop(src) @@ -170,6 +174,7 @@ New() src.modules += new /obj/item/device/flashlight(src) + src.modules += new /obj/item/device/flash(src) src.modules += new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src) src.modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src) src.modules += new /obj/item/weapon/pen/robopen(src) @@ -203,6 +208,7 @@ New() src.modules += new /obj/item/device/flashlight(src) + src.modules += new /obj/item/device/flash(src) src.modules += new /obj/item/borg/sight/meson(src) src.emag = new /obj/item/borg/stun(src) src.modules += new /obj/item/weapon/storage/bag/ore(src) @@ -216,6 +222,8 @@ New() + src.modules += new /obj/item/device/flashlight(src) + src.modules += new /obj/item/device/flash(src) src.modules += new /obj/item/weapon/melee/energy/sword(src) src.modules += new /obj/item/weapon/gun/energy/pulse_rifle/destroyer(src) src.modules += new /obj/item/weapon/card/emag(src) @@ -225,6 +233,8 @@ name = "combat robot module" New() + src.modules += new /obj/item/device/flashlight(src) + src.modules += new /obj/item/device/flash(src) src.modules += new /obj/item/borg/sight/thermal(src) src.modules += new /obj/item/weapon/gun/energy/laser/cyborg(src) src.modules += new /obj/item/weapon/pickaxe/plasmacutter(src) @@ -266,8 +276,7 @@ ) New() - //TODO: Replace with shittier flashlight ~Z - src.modules += new /obj/item/device/flashlight(src) + src.modules += new /obj/item/device/flashlight/drone(src) src.modules += new /obj/item/weapon/weldingtool(src) src.modules += new /obj/item/weapon/screwdriver(src) src.modules += new /obj/item/weapon/wrench(src)