Merge pull request 'Fixing Ships' (#4) from akrasia-patch-1 into master

Reviewed-on: http://git.wubzy.xyz/Luno/Luno/pulls/4

commands/fun/ships.js

@@ -10,8 +10,8 @@ module.exports = {
     },
     async execute(message, msg, args, cmd, prefix, mention, client) {
 
-        const start = message.mentions.members.first()
-        const end = message.mentions.members.map(m => m.user.username).splice(1)
+        const start = message.mentions.members.first().user.username || args[0];
+        const end = message.mentions.members.map(m => m.user.username).splice(1) || args[1];
         if (!start && !end || !start || !end) return message.channel.send(this.help);
         let finalName = `${start.slice(0, Math.floor(start.length / 2))+end.slice(Math.floor(end.length / 2))}`
         const Embed = new Discord.MessageEmbed()