Merge branch 'master' into upstream-merge-13825

code/modules/admin/verbs/buildmode.dm

@@ -189,6 +189,7 @@
 	var/atom/movable/throw_atom = null
 	var/list/selected_mobs = list()
 	var/copied_faction = null
+	var/warned = 0
 
 /obj/effect/bmode/buildholder/Destroy()
 	qdel(builddir)
@@ -219,7 +220,7 @@
 	screen_loc = "NORTH,WEST+2"
 	var/varholder = "name"
 	var/valueholder = "derp"
-	var/objholder = /obj/structure/closet
+	var/objholder = null
 	var/objsay = 1
 
 	var/wall_holder = /turf/simulated/wall
@@ -252,7 +253,7 @@
 
 				return 1
 			if(BUILDMODE_ADVANCED)
-				objholder = get_path_from_partial_text(/obj/structure/closet)
+				objholder = get_path_from_partial_text()
 
 			if(BUILDMODE_EDIT)
 				var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "viruses", "cuffed", "ka", "last_eaten", "urine")
@@ -330,7 +331,13 @@
 					return
 				else if(istype(object,/turf/simulated/floor))
 					var/turf/T = object
-					T.ChangeTurf(/turf/space)
+					if(!holder.warned)
+						var/warning = tgui_alert(user, "Are you -sure- you want to delete this turf and make it the base turf for this Z level?", "GRIEF ALERT", list("No", "Yes"))
+						if(warning == "Yes")
+							holder.warned = 1
+						else
+							return
+					T.ChangeTurf(get_base_turf_by_area(T)) //Defaults to Z if area does not have a special base turf.
 					return
 				else if(istype(object,/turf/simulated/wall/r_wall))
 					var/turf/T = object
@@ -358,6 +365,13 @@
 					if(NORTHWEST)
 						var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
 						WIN.set_dir(NORTHWEST)
+			else if(istype(object,/turf) && pa.Find("ctrl") && pa.Find("alt") && pa.Find("middle"))
+				var/turf/T = object
+				var/obj/item/toy/plushie/teshari/easter_egg = new /obj/item/toy/plushie/teshari(T)
+				easter_egg.name = "coding teshari plushie"
+				easter_egg.desc = "A small purple teshari with a plush keyboard attached to it. Where did this come from?"
+				easter_egg.color = "#a418c7"
+
 
 		if(BUILDMODE_ADVANCED)
 			if(pa.Find("left") && !pa.Find("ctrl"))
@@ -647,8 +661,6 @@
 		result = matches[1]
 	else
 		result = tgui_input_list(usr, "Select an atom type", "Spawn Atom", matches, strict_modern = TRUE)
-		if(!objholder)
-			result = default_path
 	return result
 
 /obj/effect/bmode/buildmode/proc/make_rectangle(var/turf/A, var/turf/B, var/turf/wall_type, var/turf/floor_type)