Merge branch 'master' into singularity

service/fit.py

@@ -150,8 +150,8 @@ class Fit(object):
         return fit.modules[pos]
 
     def newFit(self, shipID, name=None):
-        fit = eos.types.Fit()
-        fit.ship = eos.types.Ship(eos.db.getItem(shipID))
+        ship = eos.types.Ship(eos.db.getItem(shipID))
+        fit = eos.types.Fit(ship)
         fit.name = name if name is not None else "New %s" % fit.ship.item.name
         fit.damagePattern = self.pattern
         fit.targetResists = self.targetResists
@@ -275,7 +275,6 @@ class Fit(object):
         except ValueError:
             return False
 
-        fit.implants.freeSlot(implant)
         fit.implants.append(implant)
         self.recalc(fit)
         return True
@@ -301,7 +300,6 @@ class Fit(object):
         except ValueError:
             return False
 
-        fit.boosters.freeSlot(booster)
         fit.boosters.append(booster)
         self.recalc(fit)
         return True