From 3b298566941b2d8e16874fc4b20f3c49960ae18c Mon Sep 17 00:00:00 2001 From: Kelenius Date: Sat, 15 Aug 2015 13:04:57 +0300 Subject: [PATCH 1/5] Fixes #10599 --- code/modules/reagents/Chemistry-Holder.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 166cda695e..8a7e34ccb9 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -399,7 +399,7 @@ if(!target) return - var/datum/reagents/R = new /datum/reagents(maximum_volume) + var/datum/reagents/R = new /datum/reagents(amount * multiplier) . = trans_to_holder(R, amount, multiplier, copy) R.touch_turf(target) return @@ -409,7 +409,7 @@ return if(!target.reagents) - var/datum/reagents/R = new /datum/reagents(maximum_volume) + var/datum/reagents/R = new /datum/reagents(amount * multiplier) . = trans_to_holder(R, amount, multiplier, copy) R.touch_obj(target) return From 24fb46f1a928794ee6ba37ef831bd6d0c6972b71 Mon Sep 17 00:00:00 2001 From: Kelenius Date: Sat, 15 Aug 2015 13:05:49 +0300 Subject: [PATCH 2/5] Fixes #9332 --- code/game/atoms.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 69abb07358..4df4ad0e71 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -411,7 +411,6 @@ its easier to just keep the beam vertical. /atom/proc/clean_blood() if(!simulated) return - src.color = initial(src.color) //paint src.germ_level = 0 if(istype(blood_DNA, /list)) del(blood_DNA) From cb5df3963af51a968a084df7d08e5cee8e4ee556 Mon Sep 17 00:00:00 2001 From: Kelenius Date: Sat, 15 Aug 2015 13:15:52 +0300 Subject: [PATCH 3/5] Reverts #10649, fixes #10621 --- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 0d04d8ad99..fdbac0339e 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -563,7 +563,6 @@ adj_drowsy = -3 adj_sleepy = -2 adj_temp = 25 - overdose = 45 glass_icon_state = "hot_coffee" glass_name = "cup of coffee" @@ -575,11 +574,8 @@ return if(adj_temp > 0) holder.remove_reagent("frostoil", 10 * removed) - -/datum/reagent/drink/coffee/overdose(var/mob/living/carbon/M, var/alien) - if(alien == IS_DIONA) - return - M.make_jittery(5) + if(dose > 45) + M.make_jittery(5) /datum/reagent/drink/coffee/icecoffee name = "Iced Coffee" From 982ec2df21aaf863aa287e913b96672b2d99d86b Mon Sep 17 00:00:00 2001 From: volas Date: Sat, 15 Aug 2015 14:01:19 +0300 Subject: [PATCH 4/5] Fixes #10508 --- code/__HELPERS/text.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index ae38249956..dcc231295d 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -54,7 +54,7 @@ //If you have a problem with sanitize() in chat, when quotes and >, < are displayed as html entites - //this is a problem of double-encode(when & becomes &), use sanitize() with encode=0, but not the sanitizeSafe()! /proc/sanitizeSafe(var/input, var/max_length = MAX_MESSAGE_LEN, var/encode = 1, var/trim = 1, var/extra = 1) - return sanitize(replace_characters(input, list(">"=" ","<"=" ", "\""="'"), max_length, encode, trim, extra)) + return sanitize(replace_characters(input, list(">"=" ","<"=" ", "\""="'")), max_length, encode, trim, extra) //Filters out undesirable characters from names /proc/sanitizeName(var/input, var/max_length = MAX_NAME_LEN, var/allow_numbers = 0) From 4b21f5f8ad57ef3d77252239e6306817a3edfae5 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sat, 15 Aug 2015 15:46:52 -0400 Subject: [PATCH 5/5] Fixes pipes disappearing when wrenching fails --- code/controllers/Processes/garbage.dm | 4 ++++ code/game/machinery/pipe/construction.dm | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/code/controllers/Processes/garbage.dm b/code/controllers/Processes/garbage.dm index 31a28a91a5..b3f1917f6b 100644 --- a/code/controllers/Processes/garbage.dm +++ b/code/controllers/Processes/garbage.dm @@ -80,6 +80,10 @@ var/list/delayed_garbage = list() /datum/controller/process/garbage_collector/getStatName() return ..()+"([garbage_collector.destroyed.len]/[garbage_collector.dels]/[garbage_collector.hard_dels])" +// Tests if an atom has been deleted. +/proc/deleted(atom/A) + return !A || !isnull(A.gcDestroyed) + // Should be treated as a replacement for the 'del' keyword. // Datums passed to this will be given a chance to clean up references to allow the GC to collect them. /proc/qdel(var/datum/A) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 9bee0af72f..c6d257c5cb 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -463,7 +463,7 @@ Buildable meters var/turf/T = P.loc P.level = T.intact ? 2 : 1 P.initialize() - if (!P) + if (deleted(P)) usr << pipefailtext return 1 P.build_network() @@ -482,7 +482,7 @@ Buildable meters var/turf/T = P.loc P.level = T.intact ? 2 : 1 P.initialize() - if (!P) + if (deleted(P)) usr << pipefailtext return 1 P.build_network() @@ -501,7 +501,7 @@ Buildable meters var/turf/T = P.loc P.level = T.intact ? 2 : 1 P.initialize() - if (!P) + if (deleted(P)) usr << pipefailtext return 1 P.build_network() @@ -520,7 +520,7 @@ Buildable meters var/turf/T = P.loc P.level = T.intact ? 2 : 1 P.initialize() - if (!P) + if (deleted(P)) usr << pipefailtext return 1 P.build_network() @@ -539,7 +539,7 @@ Buildable meters //var/turf/T = P.loc //P.level = T.intact ? 2 : 1 P.initialize() - if (!P) + if (deleted(P)) usr << pipefailtext return 1 P.build_network() @@ -574,7 +574,7 @@ Buildable meters var/turf/T = M.loc M.level = T.intact ? 2 : 1 M.initialize() - if (!M) + if (deleted(M)) usr << pipefailtext return 1 M.build_network() @@ -643,7 +643,7 @@ Buildable meters var/turf/T = M.loc M.level = T.intact ? 2 : 1 M.initialize() - if (!M) + if (deleted(M)) usr << pipefailtext return 1 M.build_network() @@ -722,7 +722,7 @@ Buildable meters //var/turf/T = P.loc //P.level = T.intact ? 2 : 1 P.initialize() - if (!P) + if (deleted(P)) usr << pipefailtext //"There's nothing to connect this pipe to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)" return 1 P.build_network() @@ -905,7 +905,7 @@ Buildable meters var/turf/T = P.loc P.level = T.intact ? 2 : 1 P.initialize() - if (!P) + if (deleted(P)) usr << pipefailtext return 1 P.build_network()