Merge remote-tracking branch 'upstream/master' into TGUI-3.0

code/controllers/subsystem/garbage.dm

@@ -451,3 +451,18 @@ SUBSYSTEM_DEF(garbage)
 #endif
 
 #endif
+
+#ifdef TESTING
+/proc/writeDatumCount()
+	var/list/datums = list()
+	for(var/datum/D in world)
+		datums[D.type] += 1
+	for(var/datum/D)
+		datums[D.type] += 1
+	datums = sortTim(datums, /proc/cmp_numeric_dsc, associative = TRUE)
+	if(fexists("data/DATUMCOUNT.txt"))
+		fdel("data/DATUMCOUNT.txt")
+	var/outfile = file("data/DATUMCOUNT.txt")
+	for(var/path in datums)
+		outfile << "[datums[path]]\t\t\t\t\t[path]"
+#endif

code/controllers/subsystem/input.dm

@@ -43,7 +43,7 @@ SUBSYSTEM_DEF(input)
 	// LET'S PLAY THE BIND EVERY KEY GAME!
 	// oh except for Backspace and Enter; if you want to use those you shouldn't have used oldmode!
 	var/list/classic_ctrl_override_keys = list(
-	"\[", "\]", "\\", ";", "'", ",", ".", "/", "-", "\\=", "`"
+	"\[", "\]", "\\\\", ";", "'", ",", ".", "/", "-", "=", "`"
 	)
 	// i'm lazy let's play the list iteration game of numbers
 	for(var/i in 0 to 9)
@@ -58,8 +58,9 @@ SUBSYSTEM_DEF(input)
 	macroset_classic_input["Ctrl+L"] = "looc"
 	// let's play the list iteration game x2
 	for(var/key in classic_ctrl_override_keys)
-		macroset_classic_input["Ctrl+[key]"] = "\"KeyDown [key]\""
-		macroset_classic_input["Ctrl+[key]+UP"] = "\"KeyUp [key]\""
+		// make sure to double double quote to ensure things are treated as a key combo instead of addition/semicolon logic.
+		macroset_classic_input["\"Ctrl+[key]\""] = "\"KeyDown [istext(classic_ctrl_override_keys[key])? classic_ctrl_override_keys[key] : key]\""
+		macroset_classic_input["\"Ctrl+[key]+UP\""] = "\"KeyUp [istext(classic_ctrl_override_keys[key])? classic_ctrl_override_keys[key] : key]\""
 	// Misc
 	macroset_classic_input["Tab"] = "\".winset \\\"mainwindow.macro=[SKIN_MACROSET_CLASSIC_HOTKEYS] map.focus=true input.background-color=[COLOR_INPUT_DISABLED]\\\"\""
 	macroset_classic_input["Escape"] = "\".winset \\\"input.text=\\\"\\\"\\\"\""

code/controllers/subsystem/materials.dm

@@ -11,7 +11,11 @@ SUBSYSTEM_DEF(materials)
 	///Dictionary of category || list of material refs
 	var/list/materials_by_category
 	///List of stackcrafting recipes for materials using rigid materials
-	var/list/rigid_stack_recipes = list(new/datum/stack_recipe("chair", /obj/structure/chair/greyscale, one_per_turf = TRUE, on_floor = TRUE, applies_mats = TRUE))
+	var/list/rigid_stack_recipes = list(
+		new /datum/stack_recipe("chair", /obj/structure/chair/greyscale, one_per_turf = TRUE, on_floor = TRUE, applies_mats = TRUE),
+		new /datum/stack_recipe("toilet", /obj/structure/toilet/greyscale, one_per_turf = TRUE, on_floor = TRUE, applies_mats = TRUE),
+		new /datum/stack_recipe("sink", /obj/structure/sink/greyscale, one_per_turf = TRUE, on_floor = TRUE, applies_mats = TRUE),
+	)
 
 ///Ran on initialize, populated the materials and materials_by_category dictionaries with their appropiate vars (See these variables for more info)
 /datum/controller/subsystem/materials/proc/InitializeMaterials()

code/controllers/subsystem/processing/projectiles.dm

@@ -1,21 +1,22 @@
 PROCESSING_SUBSYSTEM_DEF(projectiles)
 	name = "Projectiles"
+	priority = FIRE_PRIORITY_PROJECTILES
 	wait = 1
 	stat_tag = "PP"
 	flags = SS_NO_INIT|SS_TICKER
-	var/global_pixel_speed = 2
-	var/global_iterations_per_move = 16
+	var/global_pixel_increment_amount = 4
+	var/global_projectile_speed_multiplier = 1
 
 /datum/controller/subsystem/processing/projectiles/proc/set_pixel_speed(new_speed)
-	global_pixel_speed = new_speed
+	global_pixel_increment_amount = new_speed
 	for(var/i in processing)
 		var/obj/item/projectile/P = i
 		if(istype(P))			//there's non projectiles on this too.
-			P.set_pixel_speed(new_speed)
+			P.set_pixel_increment_amount(new_speed)
 
 /datum/controller/subsystem/processing/projectiles/vv_edit_var(var_name, var_value)
 	switch(var_name)
-		if(NAMEOF(src, global_pixel_speed))
+		if(NAMEOF(src, global_pixel_increment_amount))
 			set_pixel_speed(var_value)
 			return TRUE
 		else

code/controllers/subsystem/research.dm

@@ -24,6 +24,7 @@ SUBSYSTEM_DEF(research)
 	var/list/techweb_categories = list()		//category name = list(node.id = TRUE)
 	var/list/techweb_boost_items = list()		//associative double-layer path = list(id = list(point_type = point_discount))
 	var/list/techweb_nodes_hidden = list()		//Node ids that should be hidden by default.
+	var/list/techweb_nodes_experimental = list()	//Node ids that are exclusive to the BEPIS.
 
 	var/list/techweb_point_items = list(		//path = list(point type = value)
 	/obj/item/assembly/signaler/anomaly            = list(TECHWEB_POINT_TYPE_GENERIC = 10000),
@@ -508,6 +509,8 @@ SUBSYSTEM_DEF(research)
 			D.unlocked_by += node.id
 		if(node.hidden)
 			techweb_nodes_hidden[node.id] = TRUE
+		if(node.experimental)
+			techweb_nodes_experimental[node.id] = TRUE
 		CHECK_TICK
 	generate_techweb_unlock_linking()