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
This commit is contained in:
Loganbacca
2014-07-24 20:14:58 +12:00
parent 2b08ca1e4a
commit 31fe0d5e34
3 changed files with 8 additions and 3 deletions
+4 -1
View File
@@ -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))
+2 -2
View File
@@ -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
+2
View File
@@ -157,6 +157,8 @@
/obj/vehicle/attack_ai(mob/user as mob)
return
/obj/vehicle/proc/handle_rotation()
return
//-------------------------------------------
// Vehicle procs