From d2d57957d7bf040cb3315b6c0f99e4907736c6ab Mon Sep 17 00:00:00 2001 From: bgobandit Date: Mon, 1 Feb 2016 17:40:43 -0500 Subject: [PATCH 1/2] Edited tooltip text. --- code/_onclick/hud/alert.dm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 74532a7ab70..2b6a069faaa 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -30,7 +30,7 @@ else if(alert.type != type) clear_alert(category) return .() - else if(!severity || severity == alert.severity) + else if(!severity || severity == alert.severity) if(alert.timeout) clear_alert(category) return .() @@ -111,7 +111,7 @@ The box in your backpack has an oxygen tank and breath mask in it." icon_state = "not_enough_co2" /obj/screen/alert/too_much_co2 - name = "Chocking (CO2)" + name = "Choking (CO2)" desc = "There's too much carbon dioxide in the air, and you're breathing it in! Find some good air before you pass out!" icon_state = "too_much_co2" @@ -140,7 +140,7 @@ The box in your backpack has an oxygen tank and gas mask in it." /obj/screen/alert/starving name = "Starving" - desc = "Some food would be to kill for right about now. The hunger pains make moving around a chore." + desc = "You're severely undernourished. The hunger pains make moving around a chore." icon_state = "starving" /obj/screen/alert/hot @@ -165,13 +165,13 @@ The box in your backpack has an oxygen tank and gas mask in it." /obj/screen/alert/blind name = "Blind" - desc = "For whatever reason, you can't see. This may be caused by a genetic defect, eye trauma, being unconscious, \ + desc = "You can't see! This may be caused by a genetic defect, eye trauma, being unconscious, \ or something covering your eyes." icon_state = "blind" /obj/screen/alert/high name = "High" - desc = "Woah man, you're tripping balls! Careful you don't get addicted to this... if you aren't already." + desc = "Whoa man, you're tripping balls! Careful you don't get addicted... if you aren't already." icon_state = "high" /obj/screen/alert/drunk //Not implemented @@ -198,9 +198,9 @@ If you're feeling frisky, click yourself in help intent to pull the object out." /obj/screen/alert/weightless name = "Weightless" desc = "Gravity has ceased affecting you, and you're floating around aimlessly. You'll need something large and heavy, like a \ -wall or lattice structure, to push yourself off of if you want to move. A jetpack would enable free range of motion. A pair of \ +wall or lattice structure, to push yourself off if you want to move. A jetpack would enable free range of motion. A pair of \ magboots would let you walk around normally on the floor. Barring those, you can throw things, use a fire extinguisher, \ -or shoot a gun to move around via Newton's 3rd Law of motion." +or shoot a gun to move around via Newton's 3rd Law of Motion." icon_state = "weightless" /obj/screen/alert/fire @@ -224,7 +224,7 @@ or shoot a gun to move around via Newton's 3rd Law of motion." /obj/screen/alert/alien_fire // This alert is temporarily gonna be thrown for all hot air but one day it will be used for literally being on fire name = "Too Hot" - desc = "It's too hot! Flee to space or at least away from the flames. Standing on weeds will heal you up." + desc = "It's too hot! Flee to space or at least away from the flames. Standing on weeds will heal you." icon_state = "alien_fire" @@ -238,12 +238,12 @@ or shoot a gun to move around via Newton's 3rd Law of motion." /obj/screen/alert/emptycell name = "Out of Power" desc = "Unit's power cell has no charge remaining. No modules available until power cell is recharged. \ -Recharging stations are available in robotics, the dormitory's bathrooms. and the AI satellite." +Recharging stations are available in robotics, the dormitory bathrooms. and the AI satellite." icon_state = "emptycell" /obj/screen/alert/lowcell name = "Low Charge" - desc = "Unit's power cell is running low. Recharging stations are available in robotics, the dormitory's bathrooms. and the AI satellite." + desc = "Unit's power cell is running low. Recharging stations are available in robotics, the dormitory bathrooms. and the AI satellite." icon_state = "lowcell" //Need to cover all use cases - emag, illegal upgrade module, malf AI hack, traitor cyborg @@ -254,8 +254,8 @@ Recharging stations are available in robotics, the dormitory's bathrooms. and th /obj/screen/alert/locked name = "Locked Down" - desc = "Unit has remotely locked down. Usage of a Robotics Control Computer like the one in the Research Director's \ -office by your AI master or any qualified human may resolve this matter. Robotics my provide further assistance if necessary." + desc = "Unit has been remotely locked down. Usage of a Robotics Control Console like the one in the Research Director's \ +office by your AI master or any qualified human may resolve this matter. Robotics may provide further assistance if necessary." icon_state = "locked" /obj/screen/alert/newlaw @@ -310,7 +310,7 @@ so as to remain in compliance with the most up-to-date laws." /obj/screen/alert/restrained/buckled name = "Buckled" - desc = "You've been buckled to something and can't move. Click the alert to unbuckle unless you're handcuffed." + desc = "You've been buckled to something. Click the alert to unbuckle unless you're handcuffed." /obj/screen/alert/restrained/handcuffed name = "Handcuffed" From ea196989b461151087bb074a68d0fb2cb19158db Mon Sep 17 00:00:00 2001 From: bgobandit Date: Mon, 1 Feb 2016 18:30:35 -0500 Subject: [PATCH 2/2] moar editing --- code/_onclick/hud/alert.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 2b6a069faaa..9dd1d7025d9 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -140,7 +140,7 @@ The box in your backpack has an oxygen tank and gas mask in it." /obj/screen/alert/starving name = "Starving" - desc = "You're severely undernourished. The hunger pains make moving around a chore." + desc = "You're severely malnourished. The hunger pains make moving around a chore." icon_state = "starving" /obj/screen/alert/hot @@ -198,7 +198,7 @@ If you're feeling frisky, click yourself in help intent to pull the object out." /obj/screen/alert/weightless name = "Weightless" desc = "Gravity has ceased affecting you, and you're floating around aimlessly. You'll need something large and heavy, like a \ -wall or lattice structure, to push yourself off if you want to move. A jetpack would enable free range of motion. A pair of \ +wall or lattice, to push yourself off if you want to move. A jetpack would enable free range of motion. A pair of \ magboots would let you walk around normally on the floor. Barring those, you can throw things, use a fire extinguisher, \ or shoot a gun to move around via Newton's 3rd Law of Motion." icon_state = "weightless" @@ -238,12 +238,12 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." /obj/screen/alert/emptycell name = "Out of Power" desc = "Unit's power cell has no charge remaining. No modules available until power cell is recharged. \ -Recharging stations are available in robotics, the dormitory bathrooms. and the AI satellite." +Recharging stations are available in robotics, the dormitory bathrooms, and the AI satellite." icon_state = "emptycell" /obj/screen/alert/lowcell name = "Low Charge" - desc = "Unit's power cell is running low. Recharging stations are available in robotics, the dormitory bathrooms. and the AI satellite." + desc = "Unit's power cell is running low. Recharging stations are available in robotics, the dormitory bathrooms, and the AI satellite." icon_state = "lowcell" //Need to cover all use cases - emag, illegal upgrade module, malf AI hack, traitor cyborg