Clean up .rej files

2017-06-28 02:24:03 -05:00
parent a7c18e65bc
commit 789064a3a5
7 changed files with 0 additions and 10063 deletions
@@ -1,9 +0,0 @@
-diff a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm	(rejected hunks)
-@@ -536,3 +536,7 @@ SUBSYSTEM_DEF(shuttle)
- 		if(M.is_in_shuttle_bounds(A))
- 			return TRUE
- 
-+/datum/controller/subsystem/shuttle/proc/get_containing_shuttle(atom/A)
-+	for(var/obj/docking_port/mobile/M in mobile)
-+		if(M.is_in_shuttle_bounds(A))
-+			return M