From 1f70bccd37463bbcdd3aaf1a53431f973a50ea48 Mon Sep 17 00:00:00 2001 From: Geeves Date: Mon, 26 Oct 2020 09:42:26 +0200 Subject: [PATCH] Trolley Hitch Fix (#10357) --- code/modules/vehicles/train.dm | 4 ++-- html/changelogs/geeves-trolley_fix.yml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/geeves-trolley_fix.yml diff --git a/code/modules/vehicles/train.dm b/code/modules/vehicles/train.dm index eed7e11b921..8ad2bcaa21d 100644 --- a/code/modules/vehicles/train.dm +++ b/code/modules/vehicles/train.dm @@ -97,8 +97,8 @@ /obj/vehicle/train/MouseDrop_T(var/atom/movable/C, mob/user as mob) if(user.buckled || user.stat || user.restrained() || !Adjacent(user) || !user.Adjacent(C) || !istype(C) || (user == C && !user.canmove)) return - if(istype(C,/obj/vehicle/train)) - latch(C, user) + if(istype(C, /obj/vehicle/train)) + attach_to(C, user) else if(!load(C)) to_chat(user, "You were unable to load [C] on [src].") diff --git a/html/changelogs/geeves-trolley_fix.yml b/html/changelogs/geeves-trolley_fix.yml new file mode 100644 index 00000000000..ed051fbd433 --- /dev/null +++ b/html/changelogs/geeves-trolley_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Unlatched trolleys can now be hitched again by dragging from the trolley you want to hitch to, to the unhitched trolley." \ No newline at end of file