diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 04dd3803ea8..cfee76dc749 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -238,14 +238,14 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f if(!do_after(user, 20 * W.toolspeed, target = src)) return 1 anchored = !anchored - to_chat(user, (anchored ? "You have fastened the frame to the floor." : "You have unfastened the frame from the floor.")) + to_chat(user, "You have [anchored? "fastened the frame to" : "unfastened the frame from"] the floor.") if(state >= 1) if(takes_time) to_chat(user, "You begin to [(state == 1) ? "fasten the window to" : "unfasten the window from"] the frame.") if(!do_after(user, 20 * W.toolspeed, target = src)) return 1 state = 3 - state - to_chat(user, (state == 1 ? "You have unfastened the window from the frame." : "You have fastened the window to the frame.")) + to_chat(user, "You have [(state == 1) ? "unfastened the window from" : "fastened the window to"] the frame.") else if(takes_time) to_chat(user, "You begin to [anchored ? "unfasten the frame from" : "fasten the frame to"] the floor.") @@ -253,7 +253,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f return 1 anchored = !anchored update_nearby_icons() - to_chat(user, (anchored ? "You have fastened the window to the floor." : "You have unfastened the window.")) + to_chat(user, "You have [anchored ? "fastened the window to" : "unfastened the window from"] the floor.") return 1 //crowbar if(iscrowbar(W)) @@ -265,7 +265,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f if(!do_after(user, 20 * W.toolspeed, target = src)) return 1 state = 1 - state - to_chat(user, (state ? "You have pried the window into the frame." : "You have pried the window out of the frame.")) + to_chat(user, "You have pried the window [state ? "into" : "out of"] the frame.") return 1 //wrench if(iswrench(W)) @@ -276,10 +276,10 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f to_chat(user, "You begin to disassemble [src]...") if(!do_after(user, 20 * W.toolspeed, target = src)) return 1 - for(var/i=0;i= S.max_amount) continue @@ -288,7 +288,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f if(reinf) var/obj/item/stack/rods/NR = new (get_turf(src)) for(var/obj/item/stack/rods/R in loc) - if(R==NR) + if(R == NR) continue if(R.amount >= R.max_amount) continue