From 78594376f16929c2daa1a899eedd4302824fac86 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Fri, 9 Jun 2017 15:32:25 -0400 Subject: [PATCH] Fix Bluespace Harpoon bug, Allow Teleport Jamming The subspace jammers will jam portable teleporters (not the hand tele, for ~reasons~ (mostly to give it one good feature)). This should also fix an annoying bug where the bluespace harpoon fails to work for a long period of time. --- code/modules/vore/fluffstuff/custom_guns_vr.dm | 7 ++++++- code/modules/vore/fluffstuff/custom_items_vr.dm | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm index 400c327c75..8456f11558 100644 --- a/code/modules/vore/fluffstuff/custom_guns_vr.dm +++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm @@ -790,7 +790,7 @@ /obj/item/weapon/bluespace_harpoon/afterattack(atom/A, mob/user as mob) var/current_fire = world.time - if(!user || !A || user.machine) + if(!user || !A) return if(transforming) to_chat(user,"You can't fire while \the [src] transforming!") @@ -798,6 +798,11 @@ if(!(current_fire - last_fire >= 20 SECONDS)) to_chat(user,"\The [src] is recharging...") return + if(is_jammed(A) || is_jammed(user)) + to_chat(user,"\The [src] shot fizzles due to interference!") + last_fire = current_fire + playsound(user, 'sound/weapons/wave.ogg', 60, 1) + return last_fire = current_fire playsound(user, 'sound/weapons/wave.ogg', 60, 1) diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 6aa174e39d..a79b1461aa 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1031,6 +1031,11 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie to_chat(user,"\The [src] doesn't have a current valid destination set!") return + //No, you can't teleport if there's a jammer. + if(is_jammed(src) || is_jammed(destination)) + to_chat(user,"\The [src] refuses to teleport you, due to strong interference!") + return + //No, you can't port to or from away missions. Stupidly complicated check. var/turf/uT = get_turf(user) var/turf/dT = get_turf(destination)