From 99cb567eacf9219c67e463c4de08905030ab50cc Mon Sep 17 00:00:00 2001 From: GrimsonGrime Date: Thu, 10 Aug 2023 17:19:25 -0500 Subject: [PATCH 1/3] Tea Button Fix Changed the reagents list to grab the actually Tea ID instead of grabing nothing --- code/modules/reagents/chemistry/machinery/chem_dispenser.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 9e6cef6e..fa86c823 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/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, From 41de77db411af6ec23e3ddc2758afb3069138f02 Mon Sep 17 00:00:00 2001 From: evilew Date: Sat, 12 Aug 2023 18:41:19 +0200 Subject: [PATCH 2/3] quick fix kilo comms were missing a tile --- _maps/map_files/KiloStation/KiloStation.dmm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 5a792d45..5770037e 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_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, From 6f8990e6da09140b3cdd45be542f63478fc9a2ee Mon Sep 17 00:00:00 2001 From: psq95 Date: Sun, 13 Aug 2023 10:29:05 +0100 Subject: [PATCH 3/3] Strip sensitive information from SQL log --- code/controllers/subsystem/dbcore.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index 4eff4fbf..f1d63827 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/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]")