From a2bc262b0573ba62250099677b26b02841a2823a Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sun, 24 Sep 2017 01:32:52 -0500 Subject: [PATCH] Adds a few instances of to_chat() --- code/game/objects/structures/watercloset.dm | 42 ++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 90b754421b..0228b1d943 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -25,7 +25,7 @@ if(cistern && !open) if(!contents.len) - user << "The cistern is empty." + to_chat(user, "The cistern is empty.") return else var/obj/item/I = pick(contents) @@ -33,7 +33,7 @@ user.put_in_hands(I) else I.loc = get_turf(src) - user << "You find \an [I] in the cistern." + to_chat(user, "You find \an [I] in the cistern.") w_items -= I.w_class return @@ -45,7 +45,7 @@ /obj/structure/toilet/attackby(obj/item/I as obj, mob/living/user as mob) if(istype(I, /obj/item/weapon/crowbar)) - user << "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]." + to_chat(user, "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"].") playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1) if(do_after(user, 30)) user.visible_message("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!", "You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!", "You hear grinding porcelain.") @@ -62,7 +62,7 @@ if(G.state>1) if(!GM.loc == get_turf(src)) - user << "[GM.name] needs to be on the toilet." + to_chat(user, "[GM.name] needs to be on the toilet.") return if(open && !swirlie) user.visible_message("[user] starts to give [GM.name] a swirlie!", "You start to give [GM.name] a swirlie!") @@ -76,19 +76,19 @@ user.visible_message("[user] slams [GM.name] into the [src]!", "You slam [GM.name] into the [src]!") GM.adjustBruteLoss(5) else - user << "You need a tighter grip." + to_chat(user, "You need a tighter grip.") if(cistern && !istype(user,/mob/living/silicon/robot)) //STOP PUTTING YOUR MODULES IN THE TOILET. if(I.w_class > 3) - user << "\The [I] does not fit." + to_chat(user, "\The [I] does not fit.") return if(w_items + I.w_class > 5) - user << "The cistern is full." + to_chat(user, "The cistern is full.") return user.drop_item() I.loc = src w_items += I.w_class - user << "You carefully place \the [I] into the cistern." + to_chat(user, "You carefully place \the [I] into the cistern.") return @@ -108,12 +108,12 @@ var/mob/living/GM = G.affecting if(G.state>1) if(!GM.loc == get_turf(src)) - user << "[GM.name] needs to be on the urinal." + to_chat(user, "[GM.name] needs to be on the urinal.") return user.visible_message("[user] slams [GM.name] into the [src]!", "You slam [GM.name] into the [src]!") GM.adjustBruteLoss(8) else - user << "You need a tighter grip." + to_chat(user, "You need a tighter grip.") @@ -158,10 +158,10 @@ /obj/machinery/shower/attackby(obj/item/I as obj, mob/user as mob) if(I.type == /obj/item/device/analyzer) - user << "The water temperature seems to be [watertemp]." + to_chat(user, "The water temperature seems to be [watertemp].") if(istype(I, /obj/item/weapon/wrench)) var/newtemp = input(user, "What setting would you like to set the temperature valve to?", "Water Temperature Valve") in temperature_settings - user << "You begin to adjust the temperature valve with \the [I]." + to_chat(user, "You begin to adjust the temperature valve with \the [I].") playsound(src.loc, I.usesound, 50, 1) if(do_after(user, 50 * I.toolspeed)) watertemp = newtemp @@ -321,9 +321,9 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(temperature >= H.species.heat_level_1) - H << "The water is searing hot!" + to_chat(H, "The water is searing hot!") else if(temperature <= H.species.cold_level_1) - H << "The water is freezing cold!" + to_chat(H, "The water is freezing cold!") /obj/item/weapon/bikehorn/rubberducky name = "rubber ducky" @@ -346,7 +346,7 @@ if(!usr.Adjacent(src)) return ..() if(!thing.reagents || thing.reagents.total_volume == 0) - usr << "\The [thing] is empty." + to_chat(usr, "\The [thing] is empty.") return // Clear the vessel. visible_message("\The [usr] tips the contents of \the [thing] into \the [src].") @@ -360,7 +360,7 @@ if (H.hand) temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) - user << "You try to move your [temp.name], but cannot!" + to_chat(user, "You try to move your [temp.name], but cannot!") return if(isrobot(user) || isAI(user)) @@ -370,10 +370,10 @@ return if(busy) - user << "Someone's already washing here." + to_chat(user, "Someone's already washing here.") return - usr << "You start washing your hands." + to_chat(usr, "You start washing your hands.") busy = 1 sleep(40) @@ -389,7 +389,7 @@ /obj/structure/sink/attackby(obj/item/O as obj, mob/user as mob) if(busy) - user << "Someone's already washing here." + to_chat(user, "Someone's already washing here.") return var/obj/item/weapon/reagent_containers/RG = O @@ -417,7 +417,7 @@ return 1 else if(istype(O, /obj/item/weapon/mop)) O.reagents.add_reagent("water", 5) - user << "You wet \the [O] in \the [src]." + to_chat(user, "You wet \the [O] in \the [src].") playsound(loc, 'sound/effects/slosh.ogg', 25, 1) return @@ -427,7 +427,7 @@ var/obj/item/I = O if(!I || !istype(I,/obj/item)) return - usr << "You start washing \the [I]." + to_chat(usr, "You start washing \the [I].") busy = 1 sleep(40)