From b942e02a7b47e21aa2795f305b262cbf8f0c4686 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sun, 1 Aug 2021 17:30:48 -0400 Subject: [PATCH] powder that makes you say yes --- code/game/mecha/equipment/weapons/ballistic/mortar.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/game/mecha/equipment/weapons/ballistic/mortar.dm b/code/game/mecha/equipment/weapons/ballistic/mortar.dm index 6fdfa8190d..2ae61c230b 100644 --- a/code/game/mecha/equipment/weapons/ballistic/mortar.dm +++ b/code/game/mecha/equipment/weapons/ballistic/mortar.dm @@ -18,13 +18,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/mortar/action_checks(atom/target) var/turf/MT = get_turf(chassis) var/turf/TT = get_turf(target) -<<<<<<< HEAD - if(!MT.outdoors || !TT.outdoors) -||||||| parent of 7bd2f9ada6... Merge pull request #11324 from VOREStation/Arokha/fewmoreoutdoors - if(!MT.outdoors || !TT.is_outdoors()) -======= if(!MT.is_outdoors() || !TT.is_outdoors()) ->>>>>>> 7bd2f9ada6... Merge pull request #11324 from VOREStation/Arokha/fewmoreoutdoors to_chat(chassis.occupant, "\The [src]'s control system prevents you from firing due to a blocked firing arc.") return 0 - return ..() \ No newline at end of file + return ..()