From 9b230358cc9af80944df065ba57f6578fddfd3be Mon Sep 17 00:00:00 2001 From: jimmyl <70376633+mc-oofert@users.noreply.github.com> Date: Sat, 19 Aug 2023 15:59:00 +0200 Subject: [PATCH] fixes some grammar and missing servo from the ripley MK2 upgrade (#77699) ## About The Pull Request MK2 upgrade now transfers servo "intalled" -> "installed" ## Why It's Good For The Game fixes #77677 ## Changelog :cl: fix: ripley MK2 upgrade now properly transfers servos spellcheck: inserting parts into mechas now properly says "installed" instead of "intalled" /:cl: --- code/modules/vehicles/mecha/equipment/tools/work_tools.dm | 5 +++++ code/modules/vehicles/mecha/mecha_defense.dm | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/code/modules/vehicles/mecha/equipment/tools/work_tools.dm b/code/modules/vehicles/mecha/equipment/tools/work_tools.dm index 4fd125d8bb5..b2a69357a82 100644 --- a/code/modules/vehicles/mecha/equipment/tools/work_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/work_tools.dm @@ -372,6 +372,11 @@ marktwo.capacitor = markone.capacitor markone.capacitor.forceMove(marktwo) markone.capacitor = null + QDEL_NULL(marktwo.servo) + if (markone.servo) + marktwo.servo = markone.servo + markone.servo.forceMove(marktwo) + markone.servo = null marktwo.update_part_values() for(var/obj/item/mecha_parts/mecha_equipment/equipment in markone.flat_equipment) //Move the equipment over... if(istype(equipment, /obj/item/mecha_parts/mecha_equipment/ejector)) diff --git a/code/modules/vehicles/mecha/mecha_defense.dm b/code/modules/vehicles/mecha/mecha_defense.dm index ab407a65743..37fe73f4a2d 100644 --- a/code/modules/vehicles/mecha/mecha_defense.dm +++ b/code/modules/vehicles/mecha/mecha_defense.dm @@ -255,7 +255,7 @@ if(!user.transferItemToLoc(weapon, src, silent = FALSE)) return cell = weapon - balloon_alert(user, "intalled power cell") + balloon_alert(user, "installed power cell") diag_hud_set_mechcell() playsound(src, 'sound/items/screwdriver2.ogg', 50, FALSE) log_message("Power cell installed", LOG_MECHA) @@ -268,7 +268,7 @@ if(!user.transferItemToLoc(weapon, src, silent = FALSE)) return scanmod = weapon - balloon_alert(user, "intalled scanning module") + balloon_alert(user, "installed scanning module") playsound(src, 'sound/items/screwdriver2.ogg', 50, FALSE) log_message("[weapon] installed", LOG_MECHA) update_part_values() @@ -281,7 +281,7 @@ if(!user.transferItemToLoc(weapon, src, silent = FALSE)) return capacitor = weapon - balloon_alert(user, "intalled capacitor") + balloon_alert(user, "installed capacitor") playsound(src, 'sound/items/screwdriver2.ogg', 50, FALSE) log_message("[weapon] installed", LOG_MECHA) update_part_values() @@ -294,7 +294,7 @@ if(!user.transferItemToLoc(weapon, src, silent = FALSE)) return servo = weapon - balloon_alert(user, "intalled servo") + balloon_alert(user, "installed servo") playsound(src, 'sound/items/screwdriver2.ogg', 50, FALSE) log_message("[weapon] installed", LOG_MECHA) update_part_values()