From da0f9152467fa70e7317c1ad3d1ebb723284a20d Mon Sep 17 00:00:00 2001 From: Markolie Date: Thu, 27 Nov 2014 21:19:18 +0100 Subject: [PATCH] Fix cyborg zippo's --- code/game/objects/items/weapons/cigs_lighters.dm | 2 +- code/modules/mob/living/silicon/robot/robot_modules.dm | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 284877bf68f..dcf2026a871 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -393,7 +393,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = icon_off /obj/item/weapon/lighter/attack_self(mob/living/user) - if(user.r_hand == src || user.l_hand == src) + if(user.r_hand == src || user.l_hand == src || isrobot(user)) if(!lit) lit = 1 w_class = 4 diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 0a122762b20..bb7e01ae766 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -275,11 +275,7 @@ src.modules += M src.modules += new /obj/item/weapon/reagent_containers/robodropper(src) - - var/obj/item/weapon/lighter/zippo/L = new /obj/item/weapon/lighter/zippo(src) - L.lit = 1 - src.modules += L - + src.modules += new /obj/item/weapon/lighter/zippo(src) src.modules += new /obj/item/weapon/tray/robotray(src) src.modules += new /obj/item/weapon/reagent_containers/food/drinks/shaker(src) src.emag = new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src)