Merge branch 'master' of https://github.com/KabKebab/GS13

_maps/map_files/KiloStation/KiloStation.dmm

@@ -30268,6 +30268,10 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/turf/open/floor/engine{
+	initial_gas_mix = "n2=100;TEMP=80";
+	name = "mainframe floor"
+	},
 /area/tcommsat/server)
 "aXN" = (
 /obj/machinery/igniter/incinerator_toxmix,

code/controllers/subsystem/dbcore.dm

@@ -361,5 +361,7 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table
 	//strip sensitive stuff
 	if(findtext(message, ": CreateConnection("))
 		message = "CreateConnection CENSORED"
+	if(findtext(message, "INET_ATON("))
+		message = "INET_ATON CENSORED"
 	
 	log_sql("BSQL_DEBUG: [message]")

code/modules/reagents/chemistry/machinery/chem_dispenser.dm

@@ -475,7 +475,7 @@
 		/datum/reagent/consumable/ice,
 		/datum/reagent/consumable/coffee,
 		/datum/reagent/consumable/cream,
-		/datum/reagent/consumable/tea,
+		/datum/reagent/consumable/tea/pinktea,
 		/datum/reagent/consumable/icetea,
 		/datum/reagent/consumable/space_cola,
 		/datum/reagent/consumable/spacemountainwind,