Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport

# Conflicts:
#	paradise.dme

code/datums/action.dm

@@ -43,6 +43,7 @@
 	M.actions += src
 	if(M.client)
 		M.client.screen += button
+		button.locked = TRUE
 	M.update_action_buttons()
 
 /datum/action/proc/Remove(mob/M)
@@ -52,6 +53,7 @@
 	if(M.client)
 		M.client.screen -= button
 	button.moved = FALSE //so the button appears in its normal position when given to another owner.
+	button.locked = FALSE
 	M.actions -= src
 	M.update_action_buttons()
 

code/datums/datum.dm

@@ -5,8 +5,8 @@
 	var/list/comp_lookup
 	var/list/signal_procs
 	var/signal_enabled = FALSE
+	var/datum_flags = NONE
 	var/var_edited = FALSE //Warranty void if seal is broken
-
 	var/tmp/unique_datum_id = null
 
 #ifdef TESTING

code/datums/datumvars.dm

@@ -3,8 +3,8 @@
 /datum/proc/can_vv_get(var_name)
 	return TRUE
 
-/client/proc/can_vv_get(var_name)
-	return TRUE
+// /client/proc/can_vv_get(var_name)
+// 	return TRUE
 
 /datum/proc/vv_edit_var(var_name, var_value) //called whenever a var is edited
 	switch(var_name)
@@ -18,7 +18,7 @@
 	. = TRUE
 
 
-/client/proc/vv_edit_var(var_name, var_value) //called whenever a var is edited
+/client/vv_edit_var(var_name, var_value) //called whenever a var is edited
 	switch(var_name)
 		if("vars")
 			return FALSE
@@ -37,7 +37,7 @@
 			return debug_variable(var_name, list(), 0, src)
 	return debug_variable(var_name, vars[var_name], 0, src)
 
-/client/proc/vv_get_var(var_name)
+/client/vv_get_var(var_name)
 	switch(var_name)
 		if("vars")
 			return debug_variable(var_name, list(), 0, src)
@@ -57,7 +57,7 @@
 	.["Delete"] = "?_src_=vars;delete=[UID()]"
 	. += "---"
 
-/client/proc/vv_get_dropdown()
+/client/vv_get_dropdown()
 	. = list()
 	. += "---"
 	.["Call Proc"] = "?_src_=vars;proc_call=[UID()]"

code/datums/helper_datums/hotkey_modes.dm

@@ -1,27 +0,0 @@
-/datum/hotkey_mode
-	var/name
-	var/macro_hotkeys_inactive
-	var/macro_hotkeys_active
-	var/mob/my_mob
-
-/datum/hotkey_mode/New(mob)
-	my_mob = mob
-
-/datum/hotkey_mode/proc/set_winset_values()
-	winset(my_mob, null, "mainwindow.macro=[macro_hotkeys_inactive] hotkey_toggle.is-checked=false input.focus=true input.background-color=#d3b5b5")
-	winset(my_mob, null, "hotkey_toggle.command=\".winset \\\"mainwindow.macro != [macro_hotkeys_inactive] ? mainwindow.macro=[macro_hotkeys_inactive] hotkey_toggle.is-checked=false input.focus=true input.background-color=#d3b5b5 : mainwindow.macro=[macro_hotkeys_active] hotkey_toggle.is-checked=true mapwindow.map.focus=true input.background-color=#f0f0f0\\\"\"")
-
-/datum/hotkey_mode/qwerty
-	name = "QWERTY"
-	macro_hotkeys_inactive = "macro"
-	macro_hotkeys_active = "hotkeymode"
-
-/datum/hotkey_mode/azerty
-	name = "AZERTY"
-	macro_hotkeys_inactive = "azertymacro"
-	macro_hotkeys_active = "azertyhotkeymode"
-
-/datum/hotkey_mode/cyborg
-	name = "Cyborg"
-	macro_hotkeys_inactive = "borgmacro"
-	macro_hotkeys_active = "borghotkeymode"

code/datums/helper_datums/input.dm

@@ -141,6 +141,11 @@
 	..()
 	popup.add_script("autocomplete.js", 'html/browser/autocomplete.js')
 
+	for(var/i=1, i <= choices.len, i++)
+		var/C = choices[choices[i]]
+		choices[i] = url_encode(choices[i], TRUE)
+		choices[choices[i]] = C
+
 /datum/async_input/autocomplete/render_prompt()
 	return "<label for='input'>[prompt]</label>"
 
@@ -162,6 +167,8 @@
 		// Entering an invalid choice is the same as canceling
 		if(href_list["submit"] in choices)
 			result = href_list["submit"]
+		else if(url_encode(href_list["submit"], TRUE) in choices)
+			result = url_encode(href_list["submit"], TRUE)
 		close()
 		return
 

code/datums/uplink_item.dm

@@ -1440,7 +1440,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 
 /datum/uplink_item/device_tools/medgun
 	name = "Medbeam Gun"
-	desc = "Medical Beam Gun, useful in prolonged firefights."
+	desc = "Medical Beam Gun, useful in prolonged firefights. DO NOT CROSS THE BEAMS. Crossing beams with another medbeam or attaching two beams to one target will have explosive consequences."
 	item = /obj/item/gun/medbeam
 	reference = "MBG"
 	cost = 15