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

code/WorkInProgress/Tastyfish/Eliza_Data.dm

@@ -353,13 +353,10 @@
 
 	process(object)
 		// get name & message
-		var/i = findtext(object, " that ")
-		var/sl = 6
+		var/i = findtext(object, ",")
+		var/sl = 1
 		if(!i || lentext(object) < i + sl)
-			i = findtext(object, ",")
-			sl = 1
-			if(!i || lentext(object) < i + sl)
-				return "Tell who that you what?"
+			return "Tell who that you what?"
 
 		var/name = trim(copytext(object, 1, i))
 		object = trim(copytext(object, i + sl))

code/WorkInProgress/Tastyfish/wallmount_frame.dm

@@ -63,7 +63,16 @@
 					req_components = circuit.req_components.Copy()
 					for(var/A in circuit.req_components)
 						req_components[A] = circuit.req_components[A]
-					if(circuit.frame_desc) desc = circuit.frame_desc
+					req_component_names = circuit.req_components.Copy()
+					for(var/A in req_components)
+						var/cp = text2path(A)
+						var/obj/ct = new cp() // have to quickly instantiate it get name
+						req_component_names[A] = ct.name
+					if(circuit.frame_desc)
+						desc = circuit.frame_desc
+					else
+						update_desc()
+					user << desc
 				else
 					user << "\red This frame does not accept circuit boards of this type!"
 			if(istype(P, /obj/item/weapon/wirecutters))
@@ -126,19 +135,26 @@
 			if(istype(P, /obj/item/weapon))
 				for(var/I in req_components)
 					if(istype(P, text2path(I)) && (req_components[I] > 0))
+						playsound(src.loc, 'Deconstruct.ogg', 50, 1)
 						if(istype(P, /obj/item/weapon/cable_coil))
 							var/obj/item/weapon/cable_coil/CP = P
 							if(CP.amount > 1)
+								var/camt = min(CP.amount, req_components[I]) // amount of cable to take, idealy amount required, but limited by amount provided
 								var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src)
-								CC.amount = 1
+								CC.amount = camt
+								CC.update_icon()
+								CP.use(camt)
 								components += CC
-								req_components[I]--
+								req_components[I] -= camt
+								update_desc()
 								break
 						user.drop_item()
 						P.loc = src
 						components += P
 						req_components[I]--
+						update_desc()
 						break
+				user << desc
 				if(P.loc != src && !istype(P, /obj/item/weapon/cable_coil))
 					user << "\red You cannot add that component to the machine!"