Merge branch 'master' into 'master'

Fix: Petscape Wave #1: Dogs

See merge request 2009scape/2009scape!182

Server/data/configs/npc_configs.json

@@ -294498,5 +294498,185 @@
     "bonuses": "40,40,40,0,0,50,50,50,50,50,0,40,0,0,0",
     "attack_level": "90",
     "defence_animation": "404"
+  },
+  {
+    "examine": "Soft but strong... and cute.",
+    "name": "Labrador puppy",
+    "id": "7247"
+  },
+  {
+    "examine": "Soft but strong... and cute.",
+    "name": "Labrador puppy",
+    "id": "6962"
+  },
+  {
+    "examine": "Soft but strong... and cute.",
+    "name": "Labrador puppy",
+    "id": "7245"
+  },
+  {
+    "examine": "My most faithful friend.",
+    "name": "Labrador",
+    "id": "7248"
+  },
+  {
+    "examine": "My most faithful friend.",
+    "name": "Labrador",
+    "id": "6963"
+  },
+  {
+    "examine": "My most faithful friend.",
+    "name": "Labrador",
+    "id": "7246"
+  },
+  {
+    "examine": "One proud little puppy.",
+    "name": "Bulldog puppy",
+    "id": "6969"
+  },
+  {
+    "examine": "One proud little puppy.",
+    "name": "Bulldog puppy",
+    "id": "7260"
+  },
+  {
+    "examine": "One proud little puppy.",
+    "name": "Bulldog puppy",
+    "id": "7259"
+  },
+  {
+    "examine": "Looks like it's chewing a wasp.",
+    "name": "Bulldog",
+    "id": "6968"
+  },
+  {
+    "examine": "Looks like it's chewing a wasp.",
+    "name": "Bulldog",
+    "id": "7258"
+  },
+  {
+    "examine": "Looks like it's chewing a wasp.",
+    "name": "Bulldog",
+    "id": "7257"
+  },
+  {
+    "examine": "Now, if only I could find another hundred...",
+    "name": "Dalmatian puppy",
+    "id": "6964"
+  },
+  {
+    "examine": "Now, if only I could find another hundred...",
+    "name": "Dalmatian puppy",
+    "id": "7249"
+  },
+  {
+    "examine": "Now, if only I could find another hundred...",
+    "name": "Dalmatian puppy",
+    "id": "7251"
+  },
+  {
+    "examine": "A purebred doggy.",
+    "name": "Dalmatian",
+    "id": "7252"
+  },
+  {
+    "examine": "A purebred doggy.",
+    "name": "Dalmatian",
+    "id": "7250"
+  },
+  {
+    "examine": "A purebred doggy.",
+    "name": "Dalmatian",
+    "id": "6965"
+  },
+  {
+    "examine": "This is one fast little pooch.",
+    "name": "Greyhound puppy",
+    "id": "6960"
+  },
+  {
+    "examine": "This is one fast little pooch.",
+    "name": "Greyhound puppy",
+    "id": "7241"
+  },
+  {
+    "examine": "This is one fast little pooch.",
+    "name": "Greyhound puppy",
+    "id": "7243"
+  },
+  {
+    "examine": "An aerodynamic doggy.",
+    "name": "Greyhound",
+    "id": "6961"
+  },
+  {
+    "examine": "An aerodynamic doggy.",
+    "name": "Greyhound",
+    "id": "7242"
+  },
+  {
+    "examine": "An aerodynamic doggy.",
+    "name": "Greyhound",
+    "id": "7244"
+  },
+  {
+    "examine": "It's lively and energetic.",
+    "name": "Terrier puppy",
+    "id": "6958"
+  },
+  {
+    "examine": "A hyperactive little pup.",
+    "name": "Terrier puppy",
+    "id": "7237"
+  },
+  {
+    "examine": "Such a brave doggy.",
+    "name": "Terrier puppy",
+    "id": "7239"
+  },
+  {
+    "examine": "It's lively and energetic.",
+    "name": "Terrier",
+    "id": "6959"
+  },
+  {
+    "examine": "A hyperactive little pup.",
+    "name": "Terrier",
+    "id": "7238"
+  },
+  {
+    "examine": "Such a brave doggy.",
+    "name": "Terrier",
+    "id": "7240"
+  },
+  {
+    "examine": "This little puppy is very quiet.",
+    "name": "Sheepdog puppy",
+    "id": "7253"
+  },
+  {
+    "examine": "This little puppy is very quiet.",
+    "name": "Sheepdog puppy",
+    "id": "6966"
+  },
+  {
+    "examine": "This little puppy is very quiet.",
+    "name": "Sheepdog puppy",
+    "id": "7255"
+  },
+  {
+    "examine": "Come by! Come by!",
+    "name": "Sheepdog",
+    "id": "6967"
+  },
+  {
+    "examine": "Come by! Come by!",
+    "name": "Sheepdog",
+    "id": "7254"
+  },
+  {
+    "examine": "Come by! Come by!",
+    "name": "Sheepdog",
+    "id": "7256"
   }
 ]