Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r

Conflicts:
	code/game/gamemodes/changeling/changeling_mutations.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/research/server.dm

code/ATMOSPHERICS/components/trinary_devices/filter.dm

@@ -10,7 +10,7 @@ obj/machinery/atmospherics/trinary/filter
 	can_unwrench = 1
 
 	var/on = 0
-	var/temp = null // -- TLE
+	var/temp = null
 
 	var/target_pressure = ONE_ATMOSPHERE
 
@@ -138,7 +138,7 @@ Filter types:
 		set_frequency(frequency)
 		return ..()
 
-obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
+obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob)
 	if(..())
 		return
 
@@ -191,7 +191,7 @@ obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
 	onclose(user, "atmo_filter")
 	return
 
-obj/machinery/atmospherics/trinary/filter/Topic(href, href_list) // -- TLE
+obj/machinery/atmospherics/trinary/filter/Topic(href, href_list)
 	if(..())
 		return
 	usr.set_machine(src)

code/ATMOSPHERICS/components/unary/vent_pump.dm

@@ -24,7 +24,7 @@
 	//2: Do not pass internal_pressure_bound
 	//3: Do not pass either
 
-	var/welded = 0 // Added for aliens -- TLE
+	var/welded = 0
 
 	var/frequency = 1439
 	var/datum/radio_frequency/radio_connection