diff --git a/Nanako-PR-334.yml b/Nanako-PR-334.yml
new file mode 100644
index 00000000000..899a2e4fe91
--- /dev/null
+++ b/Nanako-PR-334.yml
@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Nanako
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "Passengers can now be removed from exosuit passenger compartments via the maintenance panel"
\ No newline at end of file
diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm
index 8165e0950a2..477b154b531 100644
--- a/code/game/mecha/combat/combat.dm
+++ b/code/game/mecha/combat/combat.dm
@@ -33,7 +33,7 @@
 			if(M.stat>1)
 				M.gib()
 				melee_can_hit = 0
-				if(do_after(melee_cooldown))
+				if(do_after_mecha(melee_cooldown))
 					melee_can_hit = 1
 				return
 			*/
@@ -85,7 +85,7 @@
 			src.visible_message("[src] pushes [target] out of the way.")
 
 		melee_can_hit = 0
-		if(do_after(melee_cooldown))
+		if(do_after_mecha(melee_cooldown))
 			melee_can_hit = 1
 		return
 
@@ -103,7 +103,7 @@
 						src.visible_message("<b>[src.name] smashes through the wall</b>")
 						playsound(src, 'sound/weapons/smash.ogg', 50, 1)
 					melee_can_hit = 0
-					if(do_after(melee_cooldown))
+					if(do_after_mecha(melee_cooldown))
 						melee_can_hit = 1
 					break
 	return
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index c442ac25f86..60e7930616b 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -197,7 +197,7 @@
 	pr_give_air = new /datum/global_iterator/mecha_tank_give_air(list(src))
 	pr_internal_damage = new /datum/global_iterator/mecha_internal_damage(list(src),0)
 
-/obj/mecha/proc/do_after(delay as num)
+/obj/mecha/proc/do_after_mecha(delay as num)
 	sleep(delay)
 	if(src)
 		return 1
@@ -391,7 +391,7 @@
 			if(!src.check_for_support())
 				src.pr_inertial_movement.start(list(src,direction))
 				src.log_message("Movement control lost. Inertial movement started.")
-		if(do_after(step_in))
+		if(do_after_mecha(step_in))
 			can_move = 1
 		return 1
 	return 0
@@ -1552,12 +1552,10 @@
 		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.")
+		if (do_after(user, 40, needhand=0))
+			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
@@ -1592,7 +1590,7 @@
 		src.occupant_message("Recalibrating coordination system.")
 		src.log_message("Recalibration of coordination system started.")
 		var/T = src.loc
-		if(do_after(100))
+		if(do_after_mecha(100))
 			if(T == src.loc)
 				src.clearInternalDamage(MECHA_INT_CONTROL_LOST)
 				src.occupant_message("<font color='blue'>Recalibration successful.</font>")