From 4d35e5aee182bde4717295aac36fb85b82c815d3 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sat, 4 May 2019 12:18:07 +0300 Subject: [PATCH] Comment out some conflicting jargon entries --- service/jargon/defaults.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/jargon/defaults.yaml b/service/jargon/defaults.yaml index 49b4f5cbb..540c02190 100644 --- a/service/jargon/defaults.yaml +++ b/service/jargon/defaults.yaml @@ -84,7 +84,7 @@ capac: 2500mm Repeating Cannon 3500rt: 3500mm Artillery caprt: 3500mm Artillery dlp: Dual Light Pulse -gpl: Gatling Pulse Laser +# gpl: Gatling Pulse Laser - conflicts with giga pulse sfp: Small Focused Pulse fmp: Focused Medium Pulse hpl: Heavy Pulse Laser #also catches dual heavy @@ -110,7 +110,7 @@ hml: Heavy Missile Launcher #gets HAM + RHML launcher too? rhml: Rapid Heavy Missile Launcher cml: Cruise Missile Launcher tpl: Torpedo Launcher -tl: Torpedo Launcher +# tl: Torpedo Launcher - conflicts with tracking link entry rtl: Rapid Torpedo Launcher hawml: Rapid Torpedo Launcher hawtl: Rapid Torpedo Launcher