diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 86e7ad2b22f..08febf1c572 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -355,7 +355,7 @@ if(do_after(user, 20 * W.toolspeed, target = src)) playsound(loc, W.usesound, 100, 1) open = 1 - user.visible_message("[user] screwdrivers the vent shut.", "You screwdriver the vent shut.", "You hear a screwdriver.") + user.visible_message("[user] screwdrivers the vent open.", "You screwdriver the vent open.", "You hear a screwdriver.") return if(istype(W, /obj/item/weapon/paper)) if(!welded) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index e6a43aae6b9..80ffd082f68 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -593,7 +593,7 @@ new_objective.explanation_text = "Absorb [target_number] compatible genomes." if("blood") new_objective = new /datum/objective/blood - new_objective.explanation_text = "Accumulate atleast [target_number] units of blood in total." + new_objective.explanation_text = "Accumulate at least [target_number] total units of blood." new_objective.owner = src new_objective.target_amount = target_number @@ -713,7 +713,7 @@ if(src in ticker.mode.head_revolutionaries) ticker.mode.head_revolutionaries -= src ticker.mode.update_rev_icons_removed(src) - to_chat(current, "\red Revolution has been disappointed of your leader traits! You are a regular revolutionary now!") + to_chat(current, "\red Revolution has been disappointed of your leadership traits! You are a regular revolutionary now!") else if(!(src in ticker.mode.revolutionaries)) to_chat(current, "\red You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!") else @@ -728,7 +728,7 @@ if(src in ticker.mode.revolutionaries) ticker.mode.revolutionaries -= src ticker.mode.update_rev_icons_removed(src) - to_chat(current, "\red You have proved your devotion to revoltion! Yea are a head revolutionary now!") + to_chat(current, "\red You have proven your devotion to revolution! You are a head revolutionary now!") else if(!(src in ticker.mode.head_revolutionaries)) to_chat(current, "\blue You are a member of the revolutionaries' leadership now!") else @@ -857,7 +857,7 @@ special_role = SPECIAL_ROLE_WIZARD //ticker.mode.learn_basic_spells(current) ticker.mode.update_wiz_icons_added(src) - to_chat(current, "You are the Space Wizard!") + to_chat(current, "You are a Space Wizard!") current.faction = list("wizard") log_admin("[key_name(usr)] has wizarded [key_name(current)]") message_admins("[key_name_admin(usr)] has wizarded [key_name_admin(current)]") @@ -875,7 +875,7 @@ message_admins("[key_name_admin(usr)] has allowed wizard [key_name_admin(current)] to name themselves") if("autoobjectives") ticker.mode.forge_wizard_objectives(src) - to_chat(usr, "\blue The objectives for wizard [key] have been generated. You can edit them and anounce manually.") + to_chat(usr, "\blue The objectives for wizard [key] have been generated. You can edit them and announce manually.") log_admin("[key_name(usr)] has automatically forged wizard objectives for [key_name(current)]") message_admins("[key_name_admin(usr)] has automatically forged wizard objectives for [key_name_admin(current)]") @@ -898,13 +898,13 @@ ticker.mode.grant_changeling_powers(current) ticker.mode.update_change_icons_added(src) special_role = SPECIAL_ROLE_CHANGELING - to_chat(current, "Your powers are awoken. A flash of memory returns to us...we are a changeling!") + to_chat(current, "Your powers have awoken. A flash of memory returns to us... we are a changeling!") log_admin("[key_name(usr)] has changelinged [key_name(current)]") message_admins("[key_name_admin(usr)] has changelinged [key_name_admin(current)]") if("autoobjectives") ticker.mode.forge_changeling_objectives(src) - to_chat(usr, "\blue The objectives for changeling [key] have been generated. You can edit them and anounce manually.") + to_chat(usr, "\blue The objectives for changeling [key] have been generated. You can edit them and announce manually.") log_admin("[key_name(usr)] has automatically forged objectives for [key_name(current)]") message_admins("[key_name_admin(usr)] has automatically forged objectives for [key_name_admin(current)]") @@ -942,7 +942,7 @@ slaved.masters += src som = slaved //we MIGT want to mindslave someone special_role = SPECIAL_ROLE_VAMPIRE - to_chat(current, "Your powers are awoken. Your lust for blood grows... You are a Vampire!") + to_chat(current, "Your powers have awoken. Your lust for blood grows... You are a Vampire!") log_admin("[key_name(usr)] has vampired [key_name(current)]") message_admins("[key_name_admin(usr)] has vampired [key_name_admin(current)]") @@ -1061,7 +1061,7 @@ if("autoobjectives") ticker.mode.forge_traitor_objectives(src) - to_chat(usr, "\blue The objectives for traitor [key] have been generated. You can edit them and anounce manually.") + to_chat(usr, "\blue The objectives for traitor [key] have been generated. You can edit them and announce manually.") log_admin("[key_name(usr)] has automatically forged objectives for [key_name(current)]") message_admins("[key_name_admin(usr)] has automatically forged objectives for [key_name_admin(current)]") @@ -1360,7 +1360,7 @@ to_chat(H, "A tome, a message from your new master, appears in your [where].") if(!ticker.mode.equip_cultist(current)) - to_chat(H, "Spawning an amulet from your Master failed.") + to_chat(H, "Summoning an amulet from your Master failed.") /datum/mind/proc/make_Rev() if(ticker.mode.head_revolutionaries.len>0) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 5b912908046..6dabdcf49d6 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -177,8 +177,8 @@ var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) \ /datum/objective/hijack martyr_compatible = 0 //Technically you won't get both anyway. - explanation_text = "Hijack the shuttle by escaping on it with no loyalist NanoTrasen crew on board and alive. \ - Syndicate agents, other enemies of NanoTrasen, cyborgs, and pets may be allowed to escape alive." + explanation_text = "Hijack the shuttle by escaping on it with no loyalist Nanotrasen crew on board and alive. \ + Syndicate agents, other enemies of Nanotrasen, cyborgs, and pets may be allowed to escape alive." /datum/objective/hijack/check_completion() if(!owner.current || owner.current.stat) @@ -195,7 +195,7 @@ var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) \ return shuttle_master.emergency.is_hijacked() /datum/objective/hijackclone - explanation_text = "Hijack the emergency shuttle by ensuring only you (or your copies) escape." + explanation_text = "Hijack the shuttle by ensuring only you (or your copies) escape." martyr_compatible = 0 /datum/objective/hijackclone/check_completion() @@ -489,7 +489,7 @@ var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) \ /datum/objective/blood/proc/gen_amount_goal(low = 150, high = 400) target_amount = rand(low,high) target_amount = round(round(target_amount/5)*5) - explanation_text = "Accumulate atleast [target_amount] units of blood in total." + explanation_text = "Accumulate at least [target_amount] total units of blood." return target_amount /datum/objective/blood/check_completion() diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 5679ca7f02d..6200d6dbf85 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -28,12 +28,12 @@ origin_tech = "materials=1;engineering=1" attack_verb = list("bashed", "battered", "bludgeoned", "whacked") toolspeed = 1 - + /obj/item/weapon/wrench/suicide_act(mob/user) - user.visible_message("[user] is beating themself to death with [src]! It looks like they're trying to commit suicide!") + user.visible_message("[user] is beating themselves to death with [src]! It looks like they're trying to commit suicide!") playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) return (BRUTELOSS) - + /obj/item/weapon/wrench/cyborg name = "automatic wrench" desc = "An advanced robotic wrench. Can be found in construction cyborgs." @@ -44,7 +44,7 @@ desc = "A brass wrench. It's faintly warm to the touch." icon_state = "wrench_brass" toolspeed = 0.5 - + /obj/item/weapon/wrench/abductor name = "alien wrench" desc = "A polarized wrench. It causes anything placed between the jaws to turn." @@ -55,7 +55,7 @@ origin_tech = "materials=5;engineering=5;abductor=3" /obj/item/weapon/wrench/power - name = "Hand Drill" + name = "hand drill" desc = "A simple powered drill with a bolt bit." icon_state = "drill_bolt" item_state = "drill" @@ -162,7 +162,7 @@ if((CLUMSY in user.mutations) && prob(50)) M = user return eyestab(M,user) - + /obj/item/weapon/screwdriver/brass name = "brass screwdriver" desc = "A screwdriver made of brass. The handle feels freezing cold." @@ -178,7 +178,7 @@ toolspeed = 0.1 /obj/item/weapon/screwdriver/power - name = "Hand Drill" + name = "hand drill" desc = "A simple hand drill with a screwdriver bit attached." icon_state = "drill_screw" item_state = "drill" @@ -249,7 +249,7 @@ return else ..() - + /obj/item/weapon/wirecutters/suicide_act(mob/user) user.visible_message("[user] is cutting at their arteries with [src]! It looks like they're trying to commit suicide!") playsound(loc, usesound, 50, 1, -1) @@ -275,7 +275,7 @@ toolspeed = 0.5 /obj/item/weapon/wirecutters/power - name = "Jaws of Life" + name = "jaws of life" desc = "A set of jaws of life, the magic of science has managed to fit it down into a device small enough to fit in a tool belt. It's fitted with a cutting head." icon_state = "jaws_cutter" item_state = "jawsoflife" @@ -388,7 +388,7 @@ location = get_turf(M) if(isturf(location)) location.hotspot_expose(700, 5) - + /obj/item/weapon/weldingtool/attackby(obj/item/I, mob/user, params) if(isscrewdriver(I)) flamethrower_screwdriver(I, user) @@ -578,7 +578,7 @@ /obj/item/weapon/weldingtool/mini/flamethrower_screwdriver() return - + /obj/item/weapon/weldingtool/abductor name = "alien welding tool" desc = "An alien welding tool. Whatever fuel it uses, it never runs out." @@ -589,7 +589,7 @@ change_icons = 0 origin_tech = "plasmatech=5;engineering=5;abductor=3" can_off_process = 1 - + /obj/item/weapon/weldingtool/abductor/process() if(get_fuel() <= max_fuel) reagents.add_reagent("fuel", 1) @@ -617,7 +617,7 @@ light_intensity = 1 toolspeed = 0.5 var/last_gen = 0 - + /obj/item/weapon/weldingtool/experimental/brass name = "brass welding tool" desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch." @@ -652,7 +652,7 @@ obj/item/weapon/weldingtool/experimental/process() /obj/item/weapon/crowbar/red icon_state = "crowbar_red" force = 8 - + /obj/item/weapon/crowbar/brass name = "brass crowbar" desc = "A brass crowbar. It feels faintly warm to the touch." @@ -670,7 +670,7 @@ obj/item/weapon/weldingtool/experimental/process() /obj/item/weapon/crowbar/large name = "crowbar" - desc = "It's a big crowbar. It doesn't fit in your pockets, because it's big." + desc = "It's a big crowbar. It doesn't fit in your pockets, because its too big." force = 12 w_class = WEIGHT_CLASS_NORMAL throw_speed = 3 @@ -679,7 +679,7 @@ obj/item/weapon/weldingtool/experimental/process() icon_state = "crowbar_large" item_state = "crowbar" toolspeed = 0.5 - + /obj/item/weapon/crowbar/cyborg name = "hydraulic crowbar" desc = "A hydraulic prying tool, compact but powerful. Designed to replace crowbar in construction cyborgs." @@ -688,8 +688,8 @@ obj/item/weapon/weldingtool/experimental/process() toolspeed = 0.5 /obj/item/weapon/crowbar/power - name = "Jaws of Life" - desc = "A set of jaws of life, the magic of science has managed to fit it down into a device small enough to fit in a tool belt. It's fitted with a prying head" + name = "jaws of life" + desc = "A set of jaws of life, the magic of science has managed to fit it down into a device small enough to fit in a tool belt. It's fitted with a prying head." icon_state = "jaws_pry" item_state = "jawsoflife" materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) @@ -714,7 +714,7 @@ obj/item/weapon/weldingtool/experimental/process() // Conversion kit /obj/item/weapon/conversion_kit name = "\improper Revolver Conversion Kit" - desc = "A professional conversion kit used to convert any knock off revolver into the real deal capable of shooting lethal .357 rounds without the possibility of catastrophic failure" + desc = "A professional conversion kit used to convert any knock off revolver into the real deal capable of shooting lethal .357 rounds without the possibility of catastrophic failure." icon = 'icons/obj/weapons.dmi' icon_state = "kit" flags = CONDUCT diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 7bacab397e2..c2c5fc083fa 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -94,7 +94,7 @@ base_name = "Maintenance Hatch" airlock_type = "/maintenance_hatch" glass = -1 - + /obj/structure/door_assembly/door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly base_icon_state = "highsec" base_name = "High Security Airlock" @@ -103,7 +103,7 @@ /obj/structure/door_assembly/door_assembly_shuttle base_icon_state = "shuttle" - base_name = "shuttle airlock" + base_name = "Shuttle Airlock" airlock_type = "/shuttle" glass = -1 @@ -175,10 +175,10 @@ new /obj/item/stack/sheet/rglass(src.loc) glass = 0 else if(!anchored) - user.visible_message("[user] dissassembles the airlock assembly.", "You start to dissassemble the airlock assembly.") + user.visible_message("[user] disassembles the airlock assembly.", "You start to disassemble the airlock assembly.") if(do_after(user, 40 * WT.toolspeed, target = src)) if(!src || !WT.isOn()) return - to_chat(user, "\blue You dissasembled the airlock assembly!") + to_chat(user, "\blue You disassembled the airlock assembly!") new /obj/item/stack/sheet/metal(src.loc, 4) qdel(src) else @@ -212,8 +212,9 @@ if(do_after(user, 40 * W.toolspeed, target = src)) if(!src) return - to_chat(user, "\blue You cut the airlock wires.!") - new/obj/item/stack/cable_coil(src.loc, 1) + to_chat(user, "\blue You cut the airlock's wires!") + if(state == 1) + new/obj/item/stack/cable_coil(src.loc, 1) src.state = 0 else if(istype(W, /obj/item/weapon/airlock_electronics) && state == 1 && W:icon_state != "door_electronics_smoked")