Mecha Actions: Fixes ParadiseSS13#25828 and ParadiseSS13#25826 (Parad…

…iseSS13#25830) * Drop Weapon Fix * Ficed bugged name * Removed extraneous SRC Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> * Added a return Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> --------- Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Contrabang · Jun 6, 2024 · 2a4f4c6 · 2a4f4c6
1 parent 2216afc
commit 2a4f4c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
@@ -128,6 +128,7 @@
 		if(chassis.selected == src)
 			chassis.selected = null
 		update_chassis_page()
+		remove_targeted_action()
 		chassis.log_message("[src] removed from equipment.")
 		chassis = null
 		set_ready_state(1)

diff --git a/code/game/mecha/mecha_actions.dm b/code/game/mecha/mecha_actions.dm
@@ -231,8 +231,8 @@
 	equipment = _equipment
 	icon_icon = equipment.icon
 	button_icon_state = equipment.icon_state
-	. = ..()
 	name = "Switch module to [equipment.name]"
+	return ..()
 
 /datum/action/innate/mecha/select_module/Activate()
 	if(!owner || !chassis || chassis.occupant != owner)