From 391e430e3e5cb84e0ebfa0bef516e88737de3635 Mon Sep 17 00:00:00 2001
From: monster860 <mnmaxim@gmail.com>
Date: Fri, 8 Apr 2016 13:54:40 -0400
Subject: [PATCH] I dun goofed

---
 code/game/vehicles/spacepods/spacepod.dm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/game/vehicles/spacepods/spacepod.dm b/code/game/vehicles/spacepods/spacepod.dm
index 7a24b60cec7..f02b9caf8d3 100644
--- a/code/game/vehicles/spacepods/spacepod.dm
+++ b/code/game/vehicles/spacepods/spacepod.dm
@@ -723,7 +723,11 @@
 			else
 				P.close()
 				return 1
+<<<<<<< Updated upstream
 		to_chat(user, "<span class='warning'>Access denied.</span>")
+=======
+		to_chat(usr, "<span class='warning'>Access denied.</span>")
+>>>>>>> Stashed changes
 		return
 
 	to_chat(usr, "<span class='warning'>You are not close to any pod doors.</span>")