a few last minute changes from TG

also changes His Grace from 25 to 10 requirments
2018-09-18 23:12:29 -05:00
parent 7d300117af
commit cb342866d6
32 changed files with 200 additions and 76 deletions
@@ -246,6 +246,17 @@
 		if(total_cash >= threshold)
 			break

+	if(AM.pulling)
+		if(istype(AM.pulling, /obj/item/coin))
+			var/obj/item/coin/C = AM.pulling
+			total_cash += C.value
+			counted_money += C
+
+		else if(istype(AM.pulling, /obj/item/stack/spacecash))
+			var/obj/item/stack/spacecash/S = AM.pulling
+			total_cash += S.value * S.amount
+			counted_money += S
+
 	if(total_cash >= threshold)
 		for(var/obj/I in counted_money)
 			qdel(I)