From 31fe0d5e346519c1a67d8e37e4301f8d54e4acc5 Mon Sep 17 00:00:00 2001
From: Loganbacca <wookieemanlogan@hotmail.com>
Date: Thu, 24 Jul 2014 20:14:58 +1200
Subject: [PATCH] Cargo train fixes

- Visual tweak for mobs on trolleys
- Fixed a teleportation bug when boarding trains from other trains
- Fixed a runtime involving on_click code
---
 code/modules/vehicles/cargo_train.dm | 5 ++++-
 code/modules/vehicles/train.dm       | 4 ++--
 code/modules/vehicles/vehicle.dm     | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm
index 2b2e16e4293..d38830e5e82 100644
--- a/code/modules/vehicles/cargo_train.dm
+++ b/code/modules/vehicles/cargo_train.dm
@@ -244,7 +244,10 @@
 	if(!istype(C,/obj/machinery) && !istype(C,/obj/structure/closet) && !istype(C,/obj/structure/largecrate) && !istype(C,/obj/structure/reagent_dispensers) && !istype(C,/obj/structure/ore_box) && !ismob(C))
 		return 0
 
-	return ..()
+	..()
+	
+	if(istype(load, /mob/living/carbon/human))
+		load.pixel_y += 4
 
 /obj/vehicle/train/cargo/engine/load(var/atom/movable/C)
 	if(!ismob(C))
diff --git a/code/modules/vehicles/train.dm b/code/modules/vehicles/train.dm
index faad42d1cc2..b7a6706deae 100644
--- a/code/modules/vehicles/train.dm
+++ b/code/modules/vehicles/train.dm
@@ -80,7 +80,7 @@
 	return 1
 
 /obj/vehicle/train/MouseDrop_T(var/atom/movable/C, mob/user as mob)
-	if(!usr.canmove || usr.stat || usr.restrained() || !Adjacent(usr) || !user.Adjacent(C))
+	if(user.buckled || user.stat || user.restrained() || !Adjacent(user) || !user.Adjacent(C))
 		return
 	if(istype(C,/obj/vehicle/train))
 		latch(C, user)
@@ -97,7 +97,7 @@
 		contents -= user
 	else if(load)
 		unload(user)			//unload if loaded
-	else if(!load)
+	else if(!load && !user.buckled)
 		load(user)				//else try climbing on board
 	else
 		return 0
diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
index ef2ea18a5e3..b44f38122eb 100644
--- a/code/modules/vehicles/vehicle.dm
+++ b/code/modules/vehicles/vehicle.dm
@@ -157,6 +157,8 @@
 /obj/vehicle/attack_ai(mob/user as mob)
 	return
 
+/obj/vehicle/proc/handle_rotation()
+	return
 
 //-------------------------------------------
 // Vehicle procs