From e7adf789e1e3f7a57909df5ebc8984c7568dfb58 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Sat, 22 Jun 2024 19:16:01 -0400 Subject: [PATCH] bluespace spellblade and modsuit teleporter module work better (#25900) * bluespace spellblade and modsuit teleporter module work better * nah this should stay 7 * 7 ate 9 --- code/game/objects/items/weapons/melee/melee_misc.dm | 4 +++- code/modules/mod/modules/modules_science.dm | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/melee/melee_misc.dm b/code/game/objects/items/weapons/melee/melee_misc.dm index 84faa1f6bcf..2c7e3e0e346 100644 --- a/code/game/objects/items/weapons/melee/melee_misc.dm +++ b/code/game/objects/items/weapons/melee/melee_misc.dm @@ -296,7 +296,9 @@ if(!.) return var/turf/user_turf = get_turf(user) - if(!(target in view(7, user_turf))) // no camera shenangians + if(get_dist(user_turf, get_turf(target)) > 9) //blocks cameras without blocking xray or thermals + return + if(!((target in view(9, user)) || user.sight & SEE_MOBS)) return var/list/turfs = list() for(var/turf/T in orange(1, get_turf(target))) diff --git a/code/modules/mod/modules/modules_science.dm b/code/modules/mod/modules/modules_science.dm index eab091c5acb..77d4adf73b6 100644 --- a/code/modules/mod/modules/modules_science.dm +++ b/code/modules/mod/modules/modules_science.dm @@ -77,7 +77,7 @@ if(!.) return var/turf/target_turf = get_turf(target) - if(!istype(target_turf) || target_turf.density || !(target_turf in view(9, mod.wearer))) //No. No camera bug shenanigins. + if(!istype(target_turf) || target_turf.density || !((target in view(9, mod.wearer)) || mod.wearer.sight & SEE_TURFS) || (get_dist(target_turf, get_turf(mod.wearer)) > 9)) //No. No camera bug shenanigins. return var/matrix/pre_matrix = matrix() pre_matrix.Scale(4, 0.25)