From 2c354562adeea990c573bc868cc311fa4f331c2d Mon Sep 17 00:00:00 2001 From: "giacomand@gmail.com" Date: Sun, 20 Jan 2013 23:10:36 +0000 Subject: [PATCH] - Made flamethrowers use afterattack() instead of /turf/DblClick(). - Gave engineer vending machines air alarm electronics. - Replaced a magic number with what it is defined by. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5592 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/atoms.dm | 2 +- code/game/machinery/vending.dm | 2 +- code/game/objects/items/weapons/flamethrower.dm | 9 ++++++++- code/game/turfs/turf.dm | 10 ---------- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 61ca5da76b1..6ab213ba533 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -991,7 +991,7 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl // world << "according to dblclick(), t5 is [t5]" // ------- ACTUALLY DETERMINING STUFF ------- - if (((t5 || (W && (W.flags & 16))) && !( istype(src, /obj/screen) ))) + if (((t5 || (W && (W.flags & USEDELAY))) && !( istype(src, /obj/screen) ))) // ------- ( CAN USE ITEM OR HAS 1 SECOND USE DELAY ) AND NOT CLICKING ON SCREEN ------- diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index b989f9e72de..0fa92d99f73 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -709,7 +709,7 @@ icon_state = "engivend" icon_deny = "engivend-deny" req_access_txt = "11" //Engineering Equipment access - products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/device/multitool = 4,/obj/item/weapon/airlock_electronics = 10,/obj/item/weapon/module/power_control = 10,/obj/item/weapon/cell/high = 10) + products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/device/multitool = 4,/obj/item/weapon/airlock_electronics = 10,/obj/item/weapon/module/power_control = 10,/obj/item/weapon/airalarm_electronics = 10,/obj/item/weapon/cell/high = 10) contraband = list(/obj/item/weapon/cell/potato = 3) premium = list(/obj/item/weapon/storage/belt/utility = 3) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index c19036a1849..247b8beaca9 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/flamethrower.dmi' icon_state = "flamethrowerbase" item_state = "flamethrower_0" - flags = FPRINT | TABLEPASS| CONDUCT + flags = FPRINT | TABLEPASS| CONDUCT | USEDELAY force = 3.0 throwforce = 10.0 throw_speed = 1 @@ -60,6 +60,13 @@ item_state = "flamethrower_0" return +/obj/item/weapon/flamethrower/afterattack(atom/target, mob/user, flag) + // Make sure our user is still holding us + if(user && user.get_active_hand() == src) + var/turf/target_turf = get_turf(target) + if(target_turf) + var/turflist = getline(user, target_turf) + flame_turf(turflist) /obj/item/weapon/flamethrower/attackby(obj/item/W as obj, mob/user as mob) if(user.stat || user.restrained() || user.lying) return diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 4d5c3c7c2dc..3f95616909a 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -35,16 +35,6 @@ return move_camera_by_click() if(usr.stat || usr.restrained() || usr.lying) return ..() - - if(usr.hand && istype(usr.l_hand, /obj/item/weapon/flamethrower)) - var/turflist = getline(usr,src) - var/obj/item/weapon/flamethrower/F = usr.l_hand - F.flame_turf(turflist) - else if(!usr.hand && istype(usr.r_hand, /obj/item/weapon/flamethrower)) - var/turflist = getline(usr,src) - var/obj/item/weapon/flamethrower/F = usr.r_hand - F.flame_turf(turflist) - return ..() /turf/Click()