From 3c1127acb3b0d230f3e000f6c82136d2ea0672bb Mon Sep 17 00:00:00 2001 From: Theos Date: Mon, 18 Nov 2019 01:06:53 -0500 Subject: [PATCH 1/2] fuckkk --- .../items/devices/forcefieldprojector.dm | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/code/game/objects/items/devices/forcefieldprojector.dm b/code/game/objects/items/devices/forcefieldprojector.dm index 706e62084050..0adbe4d7e4cb 100644 --- a/code/game/objects/items/devices/forcefieldprojector.dm +++ b/code/game/objects/items/devices/forcefieldprojector.dm @@ -15,6 +15,7 @@ var/max_fields = 3 var/list/current_fields var/field_distance_limit = 7 + var/creation_time = 30 /obj/item/forcefield_projector/afterattack(atom/target, mob/user, proximity_flag) . = ..() @@ -28,22 +29,23 @@ return var/turf/T = get_turf(target) var/obj/structure/projected_forcefield/found_field = locate() in T - if(found_field) - to_chat(user, "There is already a forcefield in that location!") - return - if(T.density) - return - if(get_dist(T,src) > field_distance_limit) - return - if(LAZYLEN(current_fields) >= max_fields) - to_chat(user, "[src] cannot sustain any more forcefields!") - return + if(do_after(user, creation_time, target = target)) + if(found_field) + to_chat(user, "There is already a forcefield in that location!") + return + if(T.density) + return + if(get_dist(T,src) > field_distance_limit) + return + if(LAZYLEN(current_fields) >= max_fields) + to_chat(user, "[src] cannot sustain any more forcefields!") + return - playsound(src,'sound/weapons/resonator_fire.ogg',50,1) - user.visible_message("[user] projects a forcefield!","You project a forcefield.") - var/obj/structure/projected_forcefield/F = new(T, src) - current_fields += F - user.changeNext_move(CLICK_CD_MELEE) + playsound(src,'sound/weapons/resonator_fire.ogg',50,1) + user.visible_message("[user] projects a forcefield!","You project a forcefield.") + var/obj/structure/projected_forcefield/F = new(T, src) + current_fields += F + user.changeNext_move(CLICK_CD_MELEE) /obj/item/forcefield_projector/attack_self(mob/user) if(LAZYLEN(current_fields)) From d56145ceb504c419c066a74b72a8f1e0a391b1c3 Mon Sep 17 00:00:00 2001 From: Theos Date: Mon, 18 Nov 2019 01:41:13 -0500 Subject: [PATCH 2/2] Update forcefieldprojector.dm --- code/game/objects/items/devices/forcefieldprojector.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/forcefieldprojector.dm b/code/game/objects/items/devices/forcefieldprojector.dm index 0adbe4d7e4cb..1227458c05ad 100644 --- a/code/game/objects/items/devices/forcefieldprojector.dm +++ b/code/game/objects/items/devices/forcefieldprojector.dm @@ -27,9 +27,9 @@ to_chat(user, "You deactivate [F].") qdel(F) return - var/turf/T = get_turf(target) - var/obj/structure/projected_forcefield/found_field = locate() in T if(do_after(user, creation_time, target = target)) + var/turf/T = get_turf(target) + var/obj/structure/projected_forcefield/found_field = locate() in T if(found_field) to_chat(user, "There is already a forcefield in that location!") return @@ -41,6 +41,7 @@ to_chat(user, "[src] cannot sustain any more forcefields!") return + playsound(src,'sound/weapons/resonator_fire.ogg',50,1) user.visible_message("[user] projects a forcefield!","You project a forcefield.") var/obj/structure/projected_forcefield/F = new(T, src)