diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 1a8c0b4cb87..711d173a25d 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -181,7 +181,7 @@ qdel(L) /turf/proc/TerraformTurf(path, defer_change = FALSE, ignore_air = FALSE) - return ChangeTurf(path, ignore_air) + return ChangeTurf(path, defer_change, ignore_air) //Creates a new turf /turf/proc/ChangeTurf(path, defer_change = FALSE, ignore_air = FALSE) diff --git a/code/modules/awaymissions/maploader/reader.dm b/code/modules/awaymissions/maploader/reader.dm index 1505f731362..50e0a7a3a2f 100644 --- a/code/modules/awaymissions/maploader/reader.dm +++ b/code/modules/awaymissions/maploader/reader.dm @@ -321,7 +321,7 @@ var/global/dmm_suite/preloader/_preloader = new var/turf/T = locate(x,y,z) if(T) if(ispath(path, /turf)) - T.ChangeTurf(path, 1, 0) + T.ChangeTurf(path, TRUE) instance = T else if(ispath(path, /area)) diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index 0c3a5448c44..17d68f7e607 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -142,12 +142,11 @@ else if(istype(target, /obj/effect/decal)) //stops splashing while scooping up fluids return - else if(reagents.total_volume) - if(user.a_intent == INTENT_HARM) - user.visible_message("[user] splashes the contents of [src] onto [target]!", \ - "You splash the contents of [src] onto [target].") - reagents.reaction(target, TOUCH) - reagents.clear_reagents() + else if(reagents.total_volume && user.a_intent == INTENT_HARM) + user.visible_message("[user] splashes the contents of [src] onto [target]!", \ + "You splash the contents of [src] onto [target].") + reagents.reaction(target, TOUCH) + reagents.clear_reagents() /obj/item/reagent_containers/glass/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/pen) || istype(I, /obj/item/flashlight/pen))