Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos

2021-03-08 14:46:46 -08:00
parent f07a9c13fb 457077770e
commit cc360288bd
760 changed files with 31912 additions and 23386 deletions
@@ -0,0 +1,99 @@
+/datum/filter_editor
+	var/atom/target
+
+/datum/filter_editor/New(atom/target)
+	src.target = target
+
+/datum/filter_editor/ui_state(mob/user)
+	return GLOB.admin_state
+
+/datum/filter_editor/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "Filteriffic")
+		ui.open()
+
+/datum/filter_editor/ui_static_data(mob/user)
+	var/list/data = list()
+	data["filter_info"] = GLOB.master_filter_info
+	return data
+
+/datum/filter_editor/ui_data()
+	var/list/data = list()
+	data["target_name"] = target.name
+	data["target_filter_data"] = target.filter_data
+	return data
+
+/datum/filter_editor/ui_act(action, list/params)
+	. = ..()
+	if(.)
+		return
+
+	switch(action)
+		if("add_filter")
+			var/target_name = params["name"]
+			while(target.filter_data && target.filter_data[target_name])
+				target_name = "[target_name]-dupe"
+			target.add_filter(target_name, params["priority"], list("type" = params["type"]))
+			. = TRUE
+		if("remove_filter")
+			target.remove_filter(params["name"])
+			. = TRUE
+		if("rename_filter")
+			var/list/filter_data = target.filter_data[params["name"]]
+			target.remove_filter(params["name"])
+			target.add_filter(params["new_name"], filter_data["priority"], filter_data)
+			. = TRUE
+		if("edit_filter")
+			target.remove_filter(params["name"])
+			target.add_filter(params["name"], params["priority"], params["new_filter"])
+			. = TRUE
+		if("change_priority")
+			var/new_priority = params["new_priority"]
+			target.change_filter_priority(params["name"], new_priority)
+			. = TRUE
+		if("transition_filter_value")
+			target.transition_filter(params["name"], 4, params["new_data"])
+			. = TRUE
+		if("modify_filter_value")
+			var/list/old_filter_data = target.filter_data[params["name"]]
+			var/list/new_filter_data = old_filter_data.Copy()
+			for(var/entry in params["new_data"])
+				new_filter_data[entry] = params["new_data"][entry]
+			for(var/entry in new_filter_data)
+				if(entry == GLOB.master_filter_info[old_filter_data["type"]]["defaults"][entry])
+					new_filter_data.Remove(entry)
+			target.remove_filter(params["name"])
+			target.add_filter(params["name"], old_filter_data["priority"], new_filter_data)
+			. = TRUE
+		if("modify_color_value")
+			var/new_color = input(usr, "Pick new filter color", "Filteriffic Colors!") as color|null
+			if(new_color)
+				target.transition_filter(params["name"], 4, list("color" = new_color))
+				. = TRUE
+		if("modify_icon_value")
+			var/icon/new_icon = input("Pick icon:", "Icon") as null|icon
+			if(new_icon)
+				target.filter_data[params["name"]]["icon"] = new_icon
+				target.update_filters()
+				. = TRUE
+		if("mass_apply")
+			if(!check_rights_for(usr.client, R_FUN))
+				to_chat(usr, "<span class='userdanger>Stay in your lane, jannie.</span>'")
+				return
+			var/target_path = text2path(params["path"])
+			if(!target_path)
+				return
+			var/filters_to_copy = target.filters
+			var/filter_data_to_copy = target.filter_data
+			var/count = 0
+			for(var/thing in world.contents)
+				if(istype(thing, target_path))
+					var/atom/thing_at = thing
+					thing_at.filters = filters_to_copy
+					thing_at.filter_data = filter_data_to_copy
+					count += 1
+			message_admins("LOCAL CLOWN [usr.ckey] JUST MASS FILTER EDITED [count] WITH PATH OF [params["path"]]!")
+			log_admin("LOCAL CLOWN [usr.ckey] JUST MASS FILTER EDITED [count] WITH PATH OF [params["path"]]!")
+
+
@@ -5,10 +5,13 @@

 	var/method = 0	//0 means strict type detection while 1 means this type and all subtypes (IE: /obj/item with this set to 1 will set it to ALL items)

+	if(tgui_alert(src, "Are you sure you'd like to mass-modify every instance of the [var_name] variable? This can break everything if you do not know what you are doing.", "Slow down, chief!", list("Yes", "No")) != "Yes")
+		return
+
 	if(!check_rights(R_VAREDIT))
 		return

-	if(A && A.type)
+	if(A?.type)
 		method = vv_subtype_prompt(A.type)

 	src.massmodify_variables(A, var_name, method)
@@ -114,7 +117,7 @@
 			var/list/varsvars = vv_parse_text(O, new_value)
 			var/pre_processing = new_value
 			var/unique
-			if (varsvars && varsvars.len)
+			if (varsvars?.len)
 				unique = alert(usr, "Process vars unique to each instance, or same for all?", "Variable Association", "Unique", "Same")
 				if(unique == "Unique")
 					unique = TRUE
@@ -23,7 +23,7 @@ GLOBAL_PROTECT(VVpixelmovement)
 	var/list/subtypes = subtypesof(type)
 	if (!subtypes || !subtypes.len)
 		return FALSE
-	if (subtypes && subtypes.len)
+	if (subtypes?.len)
 		switch(alert("Strict object type detection?", "Type detection", "Strictly this type","This type and subtypes", "Cancel"))
 			if("Strictly this type")
 				return FALSE
@@ -29,6 +29,12 @@
 				return

 			var/new_name = stripped_input(usr,"What would you like to name this mob?","Input a name",M.real_name,MAX_NAME_LEN)
+
+			// If the new name is something that would be restricted by IC chat filters,
+			// give the admin a warning but allow them to do it anyway if they want.
+			// if(CHAT_FILTER_CHECK(new_name) && alert(usr, "Your selected name contains words restricted by IC chat filters. Confirm this new name?", "IC Chat Filter Conflict", "Confirm", "Cancel") == "Cancel")
+			// 	return
+
 			if( !new_name || !M )
 				return

@@ -47,7 +47,7 @@
 				usr.client.debug_variables(src)
 				return

-		#ifdef REFERENCE_TRACKING //people with debug can only access this putnam!
+		#ifdef REFERENCE_TRACKING
 		if(href_list[VV_HK_VIEW_REFERENCES])
 			var/datum/D = locate(href_list[VV_HK_TARGET])
 			if(!D)
@@ -11,6 +11,9 @@
 	if(!D)
 		return

+	var/datum/asset/asset_cache_datum = get_asset_datum(/datum/asset/simple/vv)
+	asset_cache_datum.send(usr)
+
 	var/islist = islist(D)
 	if(!islist && !istype(D))
 		return