Skip to content

Commit

Permalink
fixes some grammar and missing servo from the ripley MK2 upgrade [MDB…
Browse files Browse the repository at this point in the history
… IGNORE] (#23204)

* 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:

* fixes some grammar and missing servo from the ripley MK2 upgrade

---------

Co-authored-by: jimmyl <[email protected]>
  • Loading branch information
2 people authored and Iajret committed Aug 25, 2023
1 parent 9a6afe6 commit 2fe6740
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
5 changes: 5 additions & 0 deletions code/modules/vehicles/mecha/equipment/tools/work_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,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))
Expand Down
8 changes: 4 additions & 4 deletions code/modules/vehicles/mecha/mecha_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand Down

0 comments on commit 2fe6740

Please sign in to comment.