Merge pull request #1226 from Krausus/Fixes-201505300219

Various Minor Fixes

code/modules/clothing/clothing.dm

@@ -387,7 +387,7 @@ BLIND     // can't see anything
 	if(istype(I, /obj/item/clothing/accessory))
 		var/obj/item/clothing/accessory/A = I
 		if(can_attach_accessory(A))
-			user.drop_item()
+			user.unEquip(I) // Make absolutely sure this accessory is removed from hands
 			accessories += A
 			A.on_attached(src, user)
 

code/modules/clothing/under/accessories/accessory.dm

@@ -325,4 +325,23 @@
 
 /obj/item/clothing/accessory/petcollar/attack_self(mob/user as mob)
 	tagname = copytext(sanitize(input(user, "Would you like to change the name on the tag?", "Name your new pet", "Spot") as null|text),1,MAX_NAME_LEN)
-	name = "[initial(name)] - [tagname]"
+	name = "[initial(name)] - [tagname]"
+
+/proc/english_accessory_list(obj/item/clothing/under/U)
+	if(!istype(U) || !U.accessories.len)
+		return
+	var/list/A = U.accessories
+	var/total = A.len
+	if (total == 1)
+		return "\a [A[1]]"
+	else if (total == 2)
+		return "\a [A[1]] and \a [A[2]]"
+	else
+		var/output = ""
+		var/index = 1
+		var/comma_text = ", "
+		while (index < total)
+			output += "\a [A[index]][comma_text]"
+			index++
+
+		return "[output]and \a [A[index]]"

code/modules/computer3/lapvend.dm

@@ -105,9 +105,9 @@
 		else if(network == 3)
 			dat += "<A href='?src=\ref[src];choice=cable_rem'>Network card: Powernet (25)</a><br>"
 		else
-			dat += "Network card: None"
+			dat += "Network card: None<br>"
 		if (power == 0)
-			dat += "Power source: Regular"
+			dat += "Power source: Regular<br>"
 		else if (power == 1)
 			dat += "<A href='?src=\ref[src];choice=high_rem'>Power source: Extended (175)</a><br>"
 		else
@@ -117,10 +117,10 @@
 		dat += "<br><A href='?src=\ref[src];choice=vend'>Vend Laptop</a>"
 
 	if(vendmode == 1)
-		dat += "Please swipe your card and enter your PIN to complete the transaction"
+		dat += "Please swipe your card to complete the transaction"
 
 	if(vendmode == 3)
-		dat += "Please swipe your card and enter your PIN to be finish returning your computer<br>"
+		dat += "Please swipe your card to finish returning your computer<br>"
 		dat += "<a href='?src=\ref[src];choice=cancel'>Cancel</a>"
 
 
@@ -214,8 +214,10 @@
 		var/obj/item/weapon/card/id/C = I
 		visible_message("<span class='info'>[usr] swipes a card through [src].</span>")
 		if(vendor_account)
-			var/attempt_pin = input("Enter pin code", "Vendor transaction") as num
-			var/datum/money_account/D = attempt_account_access(C.associated_account_number, attempt_pin, 2)
+			var/datum/money_account/D = attempt_account_access_nosec(C.associated_account_number)
+			if(D && D.security_level)
+				var/attempt_pin = input("Enter pin code", "Vendor transaction") as num
+				D = attempt_account_access(C.associated_account_number, attempt_pin, 2)
 			if(D)
 				var/transaction_amount = total()
 				if(transaction_amount <= D.money)

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

@@ -68,7 +68,7 @@
 		if(istype(w_uniform,/obj/item/clothing/under))
 			var/obj/item/clothing/under/U = w_uniform
 			if(U.accessories.len)
-				tie_msg += " with [lowertext(english_list(U.accessories))]"
+				tie_msg += " with [english_accessory_list(U)]"
 
 		if(w_uniform.blood_DNA)
 			msg += "<span class='warning'>[t_He] [t_is] wearing \icon[w_uniform] [w_uniform.gender==PLURAL?"some":"a"] blood-stained [w_uniform.name][tie_msg]!</span>\n"
@@ -280,7 +280,7 @@
 			continue
 
 	for(var/obj/item/organ/external/temp in organs)
-		if(temp)
+		if(temp && !temp.is_stump())
 			if(temp.status & ORGAN_ROBOT)
 				if(!(temp.brute_dam + temp.burn_dam))
 					if(!(species.flags & IS_SYNTHETIC))

code/modules/mob/mob.dm

@@ -998,6 +998,8 @@ var/list/slot_equipment_priority = list( \
 			else
 				stat(null, "processScheduler is not running.")
 
+	statpanel("Status") // Switch to the Status panel again, for the sake of the lazy Stat procs
+
 
 /mob/proc/add_stings_to_statpanel(var/list/stings)
 	for(var/obj/effect/proc_holder/changeling/S in stings)

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -239,15 +239,13 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/attack_animal(mob/M)
 	if(isanimal(M))
+		M.changeNext_move(CLICK_CD_MELEE)
 		if(iscorgi(M))
 			if(bitecount >= 4)
 				M.visible_message("[M] [pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where \the [src] was")].","<span class=\"notice\">You swallow up the last part of \the [src].")
 				playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
 				var/mob/living/simple_animal/pet/corgi/C = M
-				if (C.health <= C.maxHealth + 5)
-					C.health += 5
-				else
-					C.health = C.maxHealth
+				C.health = min(C.health + 5, C.maxHealth)
 				del(src)
 			else
 				M.visible_message("[M] takes a bite of \the [src].","<span class=\"notice\">You take a bite of \the [src].")