From fc22815f5922d28b83b195defc1d782460a58975 Mon Sep 17 00:00:00 2001
From: Joseph G <Joseph G@DESKTOP-SQ2TLHL>
Date: Fri, 26 Aug 2016 10:42:57 -0600
Subject: [PATCH] Inserted placeholder for mer equip stuff

---
 main/src/org/destinationsol/game/ship/SolShip.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/main/src/org/destinationsol/game/ship/SolShip.java b/main/src/org/destinationsol/game/ship/SolShip.java
index 12314a47f..a92d06c24 100644
--- a/main/src/org/destinationsol/game/ship/SolShip.java
+++ b/main/src/org/destinationsol/game/ship/SolShip.java
@@ -180,6 +180,11 @@ private boolean tryCollectLoot(SolObject obj, SolGame game) {
     boolean canAdd = c.canAdd(i);
     if (canAdd) {
       c.add(i);
+      if(c == myItemContainer&&myPilot.getMapHint()=="Merc")
+      {
+    	  //System.out.println("Merc could try to equip");
+    	  //insert equip code here, if it's something we want to do
+      }
     }
     return canAdd;
   }