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

code/WorkInProgress/Cael_Aislinn/Economy/Accounts.dm

@@ -112,7 +112,7 @@ var/global/obj/machinery/account_database/centcomm_account_db
 		dat += "Confirm identity: <a href='?src=\ref[src];choice=insert_card'>[held_card ? held_card : "-----"]</a><br>"
 
 		if(access_level > 0)
-			dat += "<a href='?src=\ref[src];toggle_activated=1'>Toggle remote access to this database (warning!)</a>"
+			dat += "<a href='?src=\ref[src];toggle_activated=1'>[activated ? "Disable" : "Enable"] remote access</a><br>"
 			dat += "You may not edit accounts at this terminal, only create and view them.<br>"
 			if(creating_new_account)
 				dat += "<br>"

code/WorkInProgress/Mini/ATM.dm

@@ -43,7 +43,7 @@ log transactions
 	if(stat & NOPOWER)
 		return
 
-	if(linked_db && linked_db.stat & NOPOWER)
+	if(linked_db && ( (linked_db.stat & NOPOWER) || !linked_db.activated ) )
 		linked_db = null
 		authenticated_account = null
 		src.visible_message("\red \icon[src] [src] buzzes rudely, \"Connection to remote database lost.\"")
@@ -68,7 +68,7 @@ log transactions
 
 /obj/machinery/atm/proc/reconnect_database()
 	for(var/obj/machinery/account_database/DB in world)
-		if(DB.z == src.z && !DB.stat & NOPOWER)
+		if( DB.z == src.z && !(DB.stat & NOPOWER) && DB.activated )
 			linked_db = DB
 			break
 
@@ -259,7 +259,7 @@ log transactions
 								T.time = worldtime2text()
 								authenticated_account.transaction_log.Add(T)
 							else
-								usr << "\red \icon[src] incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining."
+								usr << "\red \icon[src] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining."
 								previous_account_number = tried_account_num
 								playsound(src, 'buzz-sigh.ogg', 50, 1)
 						else
@@ -279,6 +279,8 @@ log transactions
 						T.time = worldtime2text()
 						authenticated_account.transaction_log.Add(T)
 
+						usr << "\blue \icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'"
+
 					previous_account_number = tried_account_num
 			if("withdrawal")
 				var/amount = max(text2num(href_list["funds_amount"]),0)
@@ -342,8 +344,8 @@ log transactions
 						held_card = I
 			if("logout")
 				authenticated_account = null
-				usr << browse(null,"window=atm")
-				return
+				//usr << browse(null,"window=atm")
+
 	src.attack_hand(usr)
 
 //create the most effective combination of notes to make up the requested amount
@@ -385,3 +387,14 @@ log transactions
 				I = P.id
 			if(I)
 				authenticated_account = linked_db.attempt_account_access(I.associated_account_number)
+				if(authenticated_account)
+					human_user << "\blue \icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'"
+
+					//create a transaction log entry
+					var/datum/transaction/T = new()
+					T.target_name = authenticated_account.owner_name
+					T.purpose = "Remote terminal access"
+					T.source_terminal = machine_id
+					T.date = current_date_string
+					T.time = worldtime2text()
+					authenticated_account.transaction_log.Add(T)

maps/tgstation.2.1.0.0.1.dmm

@@ -9072,6 +9072,10 @@
 "dsx" = (/obj/machinery/conveyor{dir = 8; id = "mining_internal"},/obj/machinery/mineral/output,/turf/simulated/floor{icon_state = "floorgrime"},/area/mine/production)
 "dsy" = (/obj/machinery/mineral/stacking_machine,/turf/simulated/floor{icon_state = "floorgrime"},/area/mine/production)
 "dsz" = (/obj/machinery/conveyor{tag = "icon-conveyor0 (SOUTHWEST)"; icon_state = "conveyor0"; dir = 10; id = "mining_internal"},/obj/machinery/mineral/input,/turf/simulated/floor{dir = 8; icon_state = "loadingarea"; tag = "loading"},/area/mine/production)
+"dsA" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/virology)
+"dsB" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 1; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
+"dsC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/power/apc{cell_type = 5000; dir = 1; name = "Virology APC"; pixel_x = 0; pixel_y = 24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/camera{c_tag = "Virology Module"},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
+"dsD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/light{dir = 1},/obj/machinery/firealarm{pixel_y = 25},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
 
 (1,1,1) = {"
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -9238,8 +9242,8 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafbPRbPRbPRbPRbPRbNIbNIbNIbNIbNIbNIbNIbHbbDVbMNbMNbMNbMNbMNbMNbMNbMNbTbbKQbPabTcbTDbTEbTFbQpbTGbTHbTIbTJbTKbLObLWbLObTLbTMbTNbTObTPbLObTpbTQbTRbTSbQybOhbTTbSBbSBbNlaafaaaaaaaaaaafaafaafaaabPybTUbTVbTWbPybPybPybPybPybPybPyaafbBDbBDbBDbBDbBDaaaaafaaaaaaaafaaaaaaaaaaaaaaabTXbSIbTXaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaabSJbTYbTZbUabSJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafbDVbBvbBvbBvbBvbUbbDVbDVbUcbUdbUdbUdbUdbUebUfbUfbUgbUhbUhbUhbUhbUhbUhbUhbMMbBvbUibKQbPabUjbUkbUlbUmbUnbUobUpbUqbUpbUrbLObLWbLObNfbLObUsbLObUsbLObTpbTqbUtbPsaafbNlbNlbNlbNlbNlaafaaabUubPybPybPybPybPybPybUvbUwbUxbUybUzbUAbUBbUCbUzbPyaafaafaafaafaafaafaafbUDaafaafaafaafaafaafaafbUEbRLbUFbRLbUEaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaabSJbUGbUHbUIbSJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafbUJbUKbULbUMbUNbUObDVbDVbNJbUPbDVbBvbBvbUQbURbBvbBvbUSbUTbURbBvbBvbUUbDVbNKbBvbTbbKQbPabUVbUWbUXbUYbKTbKYbUZbVabKTbKYbVbbLWbLObNfbVcbTNbRxbVdbVebVfbVgbVhbSzbOgbOhbVibVjbVkbNlaafaaabUubVlbVmbVnbVobPybVpbVqbUwbVrbUybVsbVtbVubVvbVsbPyaaaaaaaaaaafaaaaaaaaaaafaaaaaaaafaaaaaaaaaaaabRLbVwbVxbVybRLaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaabVzbVAbVBbVCbVDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaabDVbBvbBvbBvbBvbVEbVFbVFbVGbVHbVIbVHaaabVJaaaaaaaaaaaaaaaaaaaaabBvbVKbDVbNKbBvbVLbVMbVNbVObVPbVQbVRbVSbVTbVUbVVbVWbKYbVXbVYbLObNfbVcbVZbRxbVdbWabTpbTqbWbbPsaafbPtbWcbWdbWebNlaafaaabUubWfbWgbWhbUybPybWibUybWjaaaaaaaaabWkbWlbWmbWnbPyaaaaaaaaaaafaaaaaaaaabRLbRLbRLbRLbRLbRLbRLbRLbRLbWobWpbWqbRLaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaafbWrbWsbWraafaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaDdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaafbBvbWtbVHbVHbWubVHbWvbVHbVHbWwbWxbVHbVHbWybWzbWxbVHbVHbVHbVHbWAbWBbWCbWDbPabWEbWFbWGbWHbWGbWGbWIbWGbWJbKYbWKbWLbLObNfbVcbTNbRxbWMbWNbWObWPbWQbTSbQybOhbWRbVjbVjbNlaafbWSbWTbWUbWVbWWbWXbWYbWZbXabXbaaaaaaaaabXcbWYbXdbXebPyaaaaaaaaaaafaaaaaaaaabRLbXfbXgbXhbXibXjbXkbXlbXmbXnbXobXpbXqbXraaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaafbXsbXtbXsaafaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaabDVbBvbBvbBvbBvbVEbVFbVFbVGbVHbVIbVHaaabVJaaaaaaaaaaaaaaaaaaaaabBvbVKbDVbNKbBvbVLbVMbVNbVObVPbVQbVRbVSbVTbVUbVVbVWbKYbVXbVYbLObNfbVcbVZbRxbVdbWabTpbTqbWbbPsaafbPtbWcbWdbWebNlaafaaabUubWfbWgbWhbUybPybWibUybWjbUybUydsAbWkbWlbWmbWnbPyaaaaaaaaaaafaaaaaaaaabRLbRLbRLbRLbRLbRLbRLbRLbRLbWobWpbWqbRLaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaafbWrbWsbWraafaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaDdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaafbBvbWtbVHbVHbWubVHbWvbVHbVHbWwbWxbVHbVHbWybWzbWxbVHbVHbVHbVHbWAbWBbWCbWDbPabWEbWFbWGbWHbWGbWGbWIbWGbWJbKYbWKbWLbLObNfbVcbTNbRxbWMbWNbWObWPbWQbTSbQybOhbWRbVjbVjbNlaafbWSbWTbWUbWVbWWbWXbWYbWZbXabXbdsDdsCdsBbXcbWYbXdbXebPyaaaaaaaaaaafaaaaaaaaabRLbXfbXgbXhbXibXjbXkbXlbXmbXnbXobXpbXqbXraaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaafbXsbXtbXsaafaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajqajqajqajpajpajqajpajpajpajXajpajpajpajqajqaaaaaaaafaafaaaaaaaaaaaaaaaaaaaafbDYbWtbXubXvbXwbXxbXybXzbXAbXBbXCbXDbVHbXCbXEbXFbXGbXGbXHbVHbXIbXJbXKbXLbPabWEbXMbWGbWHbWGbWGbWGbXNbXObXPbXQbXRbLObNfbLObXSbLObXTbXUbTpbTqbXVbPsaafbNlbNlbNlbNlbNlaafaaabUubXWbXXbXYbXZbYabYbbYcbYdbYebYebYfbYgbYebYbbYhbPyaafaafaafaafaafaafaafbRLbYibYjbYibYkbYlbYmbYnbXmbYobYpbXmbRLbRLaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaafaaabYqaaaaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajqaaaaaaaafaafaaaaafaafaaaaaaaafaafaafaaaajqaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaabFCbWtbYrbYsbYtbYubYvbYvbYvbYvbYwbYxbYybXGbYzbXGbXGbYAbXGbYBbCObYCbYDbXLbPabWEbYEbYFbWHbWGbYGbWGbWHbWGbYHbYIbYJbLObNfbLObPlbYKbYLbYMbYNbYObYPbSzbOgbOhbYQbYRbYRbNlaafaaabYSbYTbYUbYVbPybYWbYXbYgbYYbYZbZabZbbWmbZcbZdbZebPyaaaaaaaaaaafaaaaaaaaabRLbYibYibYibZfbZgbXkbZhbZibZjbZkbZlbZmbRLaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaafaaabZnaaaaafaafaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajqaaabZobZpbZqaaabZobZpbZqaaabZobZpbZqaafbZraafaafaaaaaaaaaaaaaaaaaaaaaaaaaaabFCbWtbYrbZsbXGbYAbZtbXGbXGbXGbXGbXGbZsbZsbXGbXGbXGbXGbZubZvbCObZwbCObZxbZybYEbYEbZzbWHbZAbZBbZCbWHbWGbKYbZDbZEbZFbZGbSpbQrbZHbZIbSwbQsbTqbZJbPsaafbPtbZKbZLbZMbNlaafaafaafaafaafaafbUubZNbVsbZObZPbZQbRGbYcbZRbRGbZRbYcbPyaaaaaaaaaaafaaaaaaaaabRLbXmbXmbXmbXmbZSbYmbZTbZUbZVbZWbZXbZYbRLaaaaaaaaaaaaaaabZZbZZbZZcaaaafaafaafaafbZnaafaafaafaafaafajXbZZbZZaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -10620,3 +10624,4 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 "}
+