Merge branch 'master' of github.com:Baystation12/Baystation12

code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm

@@ -101,7 +101,11 @@
 			if("change_code")
 				var/attempt_code = input("Re-enter the current EFTPOS access code", "Confirm old EFTPOS code") as num
 				if(attempt_code == access_code)
-					access_code = input("Enter a new access code for this device", "Enter new EFTPOS code") as num
+					var/trycode = input("Enter a new access code for this device (4-6 digits, numbers only)", "Enter new EFTPOS code") as num
+					if(trycode >= 1000 && trycode <= 999999)
+						access_code = trycode
+					else
+						alert("That is not a valid code!")
 					print_reference()
 				else
 					usr << "\icon[src]<span class='warning'>Incorrect code entered.</span>"
@@ -124,7 +128,11 @@
 			if("trans_purpose")
 				transaction_purpose = input("Enter reason for EFTPOS transaction", "Transaction purpose")
 			if("trans_value")
-				transaction_amount = input("Enter amount for EFTPOS transaction", "Transaction amount") as num
+				var/try_num = input("Enter amount for EFTPOS transaction", "Transaction amount") as num
+				if(try_num < 0)
+					alert("That is not a valid amount!")
+				else
+					transaction_amount = try_num
 			if("toggle_lock")
 				if(transaction_locked)
 					var/attempt_code = input("Enter EFTPOS access code", "Reset Transaction") as num

code/WorkInProgress/Mini/ATM.dm

@@ -206,10 +206,12 @@ log transactions
 		switch(href_list["choice"])
 			if("transfer")
 				if(authenticated_account && linked_db)
-					var/target_account_number = text2num(href_list["target_acc_number"])
 					var/transfer_amount = text2num(href_list["funds_amount"])
-					var/transfer_purpose = href_list["purpose"]
-					if(transfer_amount <= authenticated_account.money)
+					if(transfer_amount <= 0)
+						alert("That is not a valid amount.")
+					else if(transfer_amount <= authenticated_account.money)
+						var/target_account_number = text2num(href_list["target_acc_number"])
+						var/transfer_purpose = href_list["purpose"]
 						if(linked_db.charge_to_account(target_account_number, authenticated_account.owner_name, transfer_purpose, machine_id, transfer_amount))
 							usr << "\icon[src]<span class='info'>Funds transfer successful.</span>"
 							authenticated_account.money -= transfer_amount
@@ -284,7 +286,9 @@ log transactions
 					previous_account_number = tried_account_num
 			if("withdrawal")
 				var/amount = max(text2num(href_list["funds_amount"]),0)
-				if(authenticated_account && amount > 0)
+				if(amount <= 0)
+					alert("That is not a valid amount.")
+				else if(authenticated_account && amount > 0)
 					if(amount <= authenticated_account.money)
 						playsound(src, 'chime.ogg', 50, 1)
 

code/modules/admin/verbs/check_customitem_activity.dm

@@ -55,7 +55,7 @@ var/inactive_keys = "None<br>"
 	//run a query to get all ckeys inactive for over 2 months
 	var/list/inactive_ckeys = list()
 	if(ckeys_with_customitems.len)
-		var/DBQuery/query_inactive = dbcon.NewQuery("SELECT ckey, lastseen FROM erro_player WHERE datediff(Now(),lastseen) > 2")
+		var/DBQuery/query_inactive = dbcon.NewQuery("SELECT ckey, lastseen FROM erro_player WHERE datediff(Now(), lastseen) > 60")
 		query_inactive.Execute()
 		while(query_inactive.NextRow())
 			var/cur_ckey = query_inactive.item[1]

code/modules/mob/living/carbon/carbon.dm

@@ -385,13 +385,13 @@
 	item.layer = initial(item.layer)
 	u_equip(item)
 	update_icons()
-	//if(src.client)
-		//src.client.screen -= item
 
-	//item.loc = src.loc
-
-	//if(istype(item, /obj/item))
-		//item:dropped(src) // let it know it's been dropped
+	if (istype(usr, /mob/living/carbon/monkey)) //Check if a monkey is throwing. Modify/remove this line as required.
+		item.loc = src.loc
+		if(src.client)
+			src.client.screen -= item
+		if(istype(item, /obj/item))
+			item:dropped(src) // let it know it's been dropped
 
 	//actually throw it!
 	if (item)

code/modules/mob/living/silicon/ai/ai.dm

@@ -234,16 +234,12 @@ var/list/ai_list = list()
 /mob/living/silicon/ai/proc/ai_roster()
 	set category = "AI Commands"
 	set name = "Show Crew Manifest"
-	var/dat = "<html><head><title>Crew Roster</title></head><body><b>Crew Roster:</b><br><br>"
-
-	var/list/L = list()
-	for (var/datum/data/record/t in data_core.general)
-		var/R = t.fields["name"] + " - " + t.fields["rank"]
-		L += R
-	for(var/R in sortList(L))
-		dat += "[R]<br>"
-	dat += "</body></html>"
+	var/dat
 
+	dat += "<h4>Crew Manifest</h4>"
+	if(data_core)
+		dat += data_core.get_manifest(0) // make it monochrome
+	dat += "<br>"
 	src << browse(dat, "window=airoster")
 	onclose(src, "airoster")
 
@@ -743,4 +739,4 @@ var/list/ai_list = list()
 			anchored = 1
 			return
 	else
-		return ..()
+		return ..()

code/modules/mob/living/silicon/pai/software.dm

@@ -413,14 +413,9 @@
 /mob/living/silicon/pai/proc/softwareManifest()
 	var/dat = ""
 	dat += "<h2>Crew Manifest</h2><br><br>"
-	var/list/L = list()
-	if(!isnull(data_core.general))
-		for (var/datum/data/record/t in sortRecord(data_core.general))
-			var/R = t.fields["name"] + " - " + t.fields["rank"]
-			L += R
-	for(var/R in sortList(L))
-		dat += "[R]<br>"
-	dat += "</body></html>"
+	if(data_core)
+		dat += data_core.get_manifest(0) // make it monochrome
+	dat += "<br>"
 	return dat
 
 // Medical Records