duffle bag fix, can now remove coins from it, small mining mapping fix to fix power, also fixed an area being slightly wrongly placed in escape arm. made the satchel spawn in the miners' hand instead of pocket.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1049 316c924e-a436-60f5-8080-3fe189b3f50e

code/WorkInProgress/mining.dm

@@ -2578,21 +2578,19 @@ proc/move_mining_shuttle()
 
 	var/dat = text("<b>The contents of the moneybag reveal...</b><br>")
 	if (amt_gold)
-		dat += text("Gold coins: [amt_gold]<br>")
+		dat += text("Gold coins: [amt_gold]<br> <A href='?src=\ref[src];remove=gold'>Remove one</A>")
 	if (amt_silver)
-		dat += text("Silver coins: [amt_silver]<br>")
+		dat += text("Silver coins: [amt_silver]<br> <A href='?src=\ref[src];remove=silver'>Remove one</A>")
 	if (amt_iron)
-		dat += text("Metal coins: [amt_iron]<br>")
+		dat += text("Metal coins: [amt_iron]<br> <A href='?src=\ref[src];remove=iron'>Remove one</A>")
 	if (amt_diamond)
-		dat += text("Diamond coins: [amt_diamond]<br>")
+		dat += text("Diamond coins: [amt_diamond]<br> <A href='?src=\ref[src];remove=diamond'>Remove one</A>")
 	if (amt_plasma)
-		dat += text("Plasma coins: [amt_plasma]<br>")
+		dat += text("Plasma coins: [amt_plasma]<br> <A href='?src=\ref[src];remove=plasma'>Remove one</A>")
 	if (amt_uranium)
-		dat += text("Uranium coins: [amt_uranium]<br>")
+		dat += text("Uranium coins: [amt_uranium]<br> <A href='?src=\ref[src];remove=uranium'>Remove one</A>")
 	if (amt_clown)
-		dat += text("Bananium coins: [amt_clown]<br>")
-	if (amt_clown)
-		dat += text("<br>Strangely you can only view the bag's contents. There is no way to remove them.")
+		dat += text("Bananium coins: [amt_clown]<br> <A href='?src=\ref[src];remove=clown'>Remove one</A>")
 	user << browse("[dat]", "window=moneybag")
 
 /obj/item/weapon/moneybag/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -2607,6 +2605,34 @@ proc/move_mining_shuttle()
 		user << "\blue You empty the [C.name] into the bag."
 	return
 
+/obj/item/weapon/moneybag/Topic(href, href_list)
+	if(..())
+		return
+	usr.machine = src
+	src.add_fingerprint(usr)
+	if(href_list["remove"])
+		var/obj/item/weapon/coin/COIN
+		switch(href_list["remove"])
+			if("gold")
+				COIN = locate(/obj/item/weapon/coin/gold,src.contents)
+			if("silver")
+				COIN = locate(/obj/item/weapon/coin/silver,src.contents)
+			if("iron")
+				COIN = locate(/obj/item/weapon/coin/iron,src.contents)
+			if("diamond")
+				COIN = locate(/obj/item/weapon/coin/diamond,src.contents)
+			if("plasma")
+				COIN = locate(/obj/item/weapon/coin/plasma,src.contents)
+			if("uranium")
+				COIN = locate(/obj/item/weapon/coin/uranium,src.contents)
+			if("clown")
+				COIN = locate(/obj/item/weapon/coin/clown,src.contents)
+		if(!COIN)
+			return
+		COIN.loc = src.loc
+	return
+
+
 /**********************Gas extractor**************************/
 
 /obj/machinery/mineral/gasextractor

code/game/jobs/jobprocs.dm

@@ -371,7 +371,7 @@
 			src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
 			src.equip_if_possible(new /obj/item/clothing/gloves/black(src), slot_gloves)
 			src.equip_if_possible(new /obj/item/weapon/crowbar(src), slot_in_backpack)
-			src.equip_if_possible(new /obj/item/weapon/satchel(src), slot_r_store)
+			src.equip_if_possible(new /obj/item/weapon/satchel(src), slot_l_hand)
 
 		if ("Assistant")
 			src.equip_if_possible(new /obj/item/clothing/under/color/grey(src), slot_w_uniform)

icons/changelog.html

@@ -39,7 +39,26 @@
 </table>
 
 <h4>Changelog</h4>
-<font color='blue'><b>14.02.2011, Valentine's day<b></font>
+<font color='blue'><b>15 February 2011, Tuesday<b></font>
+<ul>
+	<li><b>Rastaf0 updated:</b>
+	<ul>
+		<li><b><font color='blue'>Atmos now starts with nitrous oxide in storage tank.</font></b></li>
+	</ul>
+	</li>
+	<li><b>Veyveyr updated:</b>
+	<ul>
+		<li><b><font color='blue'>New look for the pipe dispenser.</font></b></li>
+	</ul>
+	<li><b>Errorage updated:</b>
+	<ul>
+		<li><b><font color='blue'>Mining station will now charge properly.</font></b></li>
+		<li><b><font color='blue'>Duffle bags (Money bags) can now be emptied.</font></b></li>
+	</ul>
+	</li>
+</ul>
+
+<font color='blue'><b>14 February 2011, Valentine's day<b></font>
 <ul>
 	<li><b>Errorage updated:</b>
 	<ul>
@@ -54,8 +73,6 @@
 		<li><b><font color='blue'>Fixed bug with switching intent while in mecha.</font></b></li>
 	</ul>
 	</li>
-	
-	
 </ul>
 
 <h5>12.02.2011, 01.00 GMT, r1021</h5>