From cfd5bcb576c13a50accf5190d6dcb4744836d005 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Thu, 9 Oct 2014 00:33:59 -0400 Subject: [PATCH] Force removing a passenger now has a delay --- code/game/mecha/mecha.dm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 3f662e4411..51352e3afb 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1575,14 +1575,19 @@ var/pname = input(user, "Choose a passenger to forcibly remove.", "Forcibly Remove Passenger") as null|anything in passengers - if (pname) - var/obj/item/mecha_parts/mecha_equipment/tool/passenger/P = passengers[pname] - var/mob/occupant = P.occupant + if (!pname) + return - visible_message("\red [user] opens the hatch on \the [P] and removes [occupant]!") - P.go_out() - P.log_message("[occupant] was removed.") - occupant_message("\red [occupant] was removed from \the [P] by [user]!") + var/obj/item/mecha_parts/mecha_equipment/tool/passenger/P = passengers[pname] + var/mob/occupant = P.occupant + + user.visible_message("\red [user] begins opening the hatch on \the [P]...", "\red You begin opening the hatch on \the [P]...") + if (!do_after(user, 40, needhand=0)) + return + + user.visible_message("\red [user] opens the hatch on \the [P] and removes [occupant]!", "\red You open the hatch on \the [P] and remove [occupant]!") + P.go_out() + P.log_message("[occupant] was removed.") return if(href_list["add_req_access"] && add_req_access && filter.getObj("id_card")) if(!in_range(src, usr)) return