From 148511e6b03745c6a4ba1c77ce47ecbd81cd4663 Mon Sep 17 00:00:00 2001 From: Heroman Date: Mon, 8 Apr 2019 16:34:36 +1000 Subject: [PATCH] Fixes some issues with BSH --- code/game/area/Space Station 13 areas_vr.dm | 3 +++ code/modules/vore/fluffstuff/guns/bsharpoon.dm | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm index c7d8b08398a..ecca3206585 100644 --- a/code/game/area/Space Station 13 areas_vr.dm +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -79,6 +79,9 @@ /area/security/nuke_storage flags = BLUE_SHIELDED +/area/supply + flags = BLUE_SHIELDED + // Add rad shielding to maintenance and construction sites /area/vacant flags = RAD_SHIELDED diff --git a/code/modules/vore/fluffstuff/guns/bsharpoon.dm b/code/modules/vore/fluffstuff/guns/bsharpoon.dm index 259ef32b52e..f573cf017a5 100644 --- a/code/modules/vore/fluffstuff/guns/bsharpoon.dm +++ b/code/modules/vore/fluffstuff/guns/bsharpoon.dm @@ -33,13 +33,16 @@ playsound(user, 'sound/weapons/wave.ogg', 60, 1) return var/turf/T = get_turf(A) - if(!T || T.check_density()) + if(!T || (T.check_density() && mode == 1)) to_chat(user,"That's a little too solid to harpoon into!") return var/turf/ownturf = get_turf(src) if(ownturf.z != T.z || get_dist(T,ownturf) > world.view) to_chat(user, "The target is out of range!") return + if(get_area(A).flags & BLUE_SHIELDED) + to_chat(user, "The target area protected by bluespace shielding!") + return last_fire = current_fire playsound(user, 'sound/weapons/wave.ogg', 60, 1)