I'm angry with my friend, but I still really like her, and want to b her friend?

Me, my friend, and another friend (they had never met)- went away for a weekend in the city. It was going awesome, everyone was getting along and we were having fun. But something happened. Me and my friend have an odd sense of humour and when we get together we bounce off each other and sometimes go too far. People don't really get us sometimes. Anyway, my other friend really needed to go to the loo and was running around like a crazy person to find one. We were helping her look, but we also laughed at her because she looked ridiculous. Seriously, thought she was going to tackle anyone who got in her way. It was really late at night. I could tell she was getting upset so I told my other friend to stop. When she finally found one, we waited for her, but she obviously exited at a different door, and walked off in the city in the middle of the night. I have serious anxiety (to the point where I'm medicated) and was beside myself. She's only 19, alone in the city, in the middle of the night. Thought she was going to die. My other friend was upset with her. Said she was being really immature. I called her a few times, finally got onto her and when I did I yelled at her and told her to wait where she was. I think she knew she had gone too far, so she didn't oppose. We met up and it was super awkward. I was a mess, I couldn't look at her. My other friend can't handle awkwardness and wanted to leave. She later apologised to both of us but it feels weird between us. I'm still upset.