diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm index 6b8642764e..0648c2bce5 100644 --- a/code/modules/vehicles/mecha/_mecha.dm +++ b/code/modules/vehicles/mecha/_mecha.dm @@ -956,7 +956,7 @@ /obj/vehicle/sealed/mecha/generate_actions() - initialize_passenger_action_type(/datum/action/vehicle/sealed/mecha/climb_out) // I don't see a single problem in generating exit vehicle action. + initialize_passenger_action_type(/datum/action/vehicle/sealed/mecha/mech_eject) // I don't see a single problem in generating exit vehicle action. initialize_controller_action_type(/datum/action/vehicle/sealed/mecha/mech_toggle_internals, VEHICLE_CONTROL_SETTINGS) initialize_controller_action_type(/datum/action/vehicle/sealed/mecha/mech_cycle_equip, VEHICLE_CONTROL_EQUIPMENT) initialize_controller_action_type(/datum/action/vehicle/sealed/mecha/mech_toggle_lights, VEHICLE_CONTROL_SETTINGS) diff --git a/code/modules/vehicles/mecha/mecha_actions.dm b/code/modules/vehicles/mecha/mecha_actions.dm index 070a3158b0..09ccaad2c2 100644 --- a/code/modules/vehicles/mecha/mecha_actions.dm +++ b/code/modules/vehicles/mecha/mecha_actions.dm @@ -273,7 +273,3 @@ button_icon_state = "mech_phasing_[chassis.phasing ? "on" : "off"]" to_chat(owner, "[icon2html(chassis, owner)]En":"#f00\">Dis"]abled phasing.") UpdateButtonIcon() - -/datum/action/vehicle/sealed/mecha/climb_out - name = "Eject From Mech" - button_icon_state = "mech_eject" diff --git a/code/modules/vehicles/mecha/mecha_construction_paths.dm b/code/modules/vehicles/mecha/mecha_construction_paths.dm index e1de113f16..ca79d98a64 100644 --- a/code/modules/vehicles/mecha/mecha_construction_paths.dm +++ b/code/modules/vehicles/mecha/mecha_construction_paths.dm @@ -557,7 +557,7 @@ inner_plating = /obj/item/stack/sheet/metal inner_plating_amount = 5 - outer_plating = /obj/item/mecha_parts/part/gygax_armor + outer_plating = /obj/item/mecha_parts/part/medigax_armor outer_plating_amount = 1 /datum/component/construction/mecha/medigax/custom_action(obj/item/I, mob/living/user, diff) @@ -687,15 +687,15 @@ /datum/component/construction/mecha/firefighter result = /obj/vehicle/sealed/mecha/working/ripley/firefighter - base_icon = "firefighter" + base_icon = "fireripley" circuit_control = /obj/item/circuitboard/mecha/ripley/main circuit_periph = /obj/item/circuitboard/mecha/ripley/peripherals - inner_plating= /obj/item/clothing/suit/fire + inner_plating = /obj/item/clothing/suit/fire inner_plating_amount = 1 - outer_plating=/obj/item/stack/sheet/plasteel + outer_plating = /obj/item/stack/sheet/plasteel outer_plating_amount = 10 /datum/component/construction/mecha/firefighter/get_outer_plating_steps() diff --git a/code/modules/vehicles/mecha/working/ripley.dm b/code/modules/vehicles/mecha/working/ripley.dm index 0d083d4bde..ef0694517d 100644 --- a/code/modules/vehicles/mecha/working/ripley.dm +++ b/code/modules/vehicles/mecha/working/ripley.dm @@ -40,7 +40,7 @@ AddComponent(/datum/component/armor_plate,3,/obj/item/stack/sheet/animalhide/goliath_hide,list(MELEE = 10, BULLET = 5, LASER = 5)) /obj/vehicle/sealed/mecha/working/ripley/generate_actions() - initialize_passenger_action_type(/datum/action/vehicle/sealed/mecha/climb_out) + initialize_passenger_action_type(/datum/action/vehicle/sealed/mecha/mech_eject) if(enclosed) initialize_controller_action_type(/datum/action/vehicle/sealed/mecha/mech_toggle_internals, VEHICLE_CONTROL_SETTINGS) initialize_controller_action_type(/datum/action/vehicle/sealed/mecha/mech_cycle_equip, VEHICLE_CONTROL_EQUIPMENT)