cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes some grammar and missing servo from the ripley MK2 upgrade (#77699)

Browse Source 
## About The Pull Request

MK2 upgrade now transfers servo
"intalled" -> "installed"

## Why It's Good For The Game

fixes #77677

## Changelog
🆑
fix: ripley MK2 upgrade now properly transfers servos
spellcheck: inserting parts into mechas now properly says "installed"
instead of "intalled"
/🆑
This commit is contained in:
jimmyl
2023-08-19 15:59:00 +02:00
committed by GitHub
parent 9acdf2d87b
commit 9b230358cc
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/mecha/equipment/tools/work_tools.dm
+5
View File
@@ -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))
code/modules/vehicles/mecha/mecha_defense.dm
+4 -4
View File
@@ -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()