[MIRROR] Revert "if you die in a mech you are ejected" [MDB IGNORE] (#…

…672) * Revert "if you die in a mech you are ejected" (#79768) --------- Co-authored-by: SkyratBot <[email protected]> Co-authored-by: Fikou <[email protected]>
Fluffy-Frontier · Nov 17, 2023 · 667cb7c · 667cb7c
1 parent 34d3ef5
commit 667cb7c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm
@@ -35,7 +35,6 @@
 	generic_canpass = FALSE
 	hud_possible = list(DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_TRACK_HUD, DIAG_CAMERA_HUD)
 	mouse_pointer = 'icons/effects/mouse_pointers/mecha_mouse.dmi'
-	verb_say = "beeps"
 	///How much energy the mech will consume each time it moves. this is the current active energy consumed
 	var/step_energy_drain = 8
 	///How much energy we drain each time we mechpunch someone

diff --git a/code/modules/vehicles/mecha/mecha_mob_interaction.dm b/code/modules/vehicles/mecha/mecha_mob_interaction.dm
@@ -158,14 +158,12 @@
 /obj/vehicle/sealed/mecha/add_occupant(mob/M, control_flags)
 	RegisterSignal(M, COMSIG_MOB_CLICKON, PROC_REF(on_mouseclick), TRUE)
 	RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(display_speech_bubble), TRUE)
-	RegisterSignal(M, COMSIG_LIVING_DEATH, PROC_REF(pilot_died), TRUE)
 	. = ..()
 	update_appearance()
 
 /obj/vehicle/sealed/mecha/remove_occupant(mob/M)
 	UnregisterSignal(M, COMSIG_MOB_CLICKON)
 	UnregisterSignal(M, COMSIG_MOB_SAY)
-	UnregisterSignal(M, COMSIG_LIVING_DEATH)
 	M.clear_alert(ALERT_CHARGE)
 	M.clear_alert(ALERT_MECH_DAMAGE)
 	if(M.client)
@@ -191,11 +189,3 @@
 	else
 		to_chat(user, span_notice("You stop exiting the mech. Weapons are enabled again."))
 	is_currently_ejecting = FALSE
-
-/obj/vehicle/sealed/mecha/proc/pilot_died(datum/source)
-	SIGNAL_HANDLER
-	if(issilicon(source) || isbrain(source))
-		return
-	playsound(src, 'sound/machines/synth_no.ogg', 25, TRUE)
-	say("Pilot fatality.")
-	mob_exit(source, randomstep = TRUE)