From d7fb1f81cafe310f033fe0ba85317fa97dea5362 Mon Sep 17 00:00:00 2001
From: VitrescentTortoise <max.blackllama@gmail.com>
Date: Tue, 28 May 2013 19:58:42 -0700
Subject: [PATCH] Fixed xenoarchaeology picksets not being able to hold
 everything they start with.

---
 code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm | 2 +-
 html/changelog.html                                          | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
index c753690ef59..ebb73a47d6b 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
@@ -118,7 +118,7 @@
 	"/obj/item/weapon/pickaxe/five_pick",\
 	"/obj/item/weapon/pickaxe/six_pick",\
 	"/obj/item/weapon/pickaxe/hand")
-	max_combined_w_class = 11
+	max_combined_w_class = 17
 	max_w_class = 4
 	use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
 
diff --git a/html/changelog.html b/html/changelog.html
index b461ddc40fc..c9c3df4cbc6 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -65,6 +65,9 @@ should be listed in the changelog upon commit though. Thanks. -->
 	<ul class="changes bgimages16">
 		<li class="bugfix">Wizard's forcewall now works.</li>
 	</ul>
+	<ul class="changes bgimages16">
+		<li class="bugfix">Xenoarchaeology picksets can now hold everything they started with.</li>
+	</ul>
 </div>
 
 <div class='commit sansserif'>