From 259626a8b48e05b69ab942f2014e6943e8717ed6 Mon Sep 17 00:00:00 2001 From: kingofkosmos Date: Sun, 13 Oct 2019 14:36:43 +0300 Subject: [PATCH] Removes excess spaces in messages. --- code/datums/components/spooky.dm | 2 +- code/datums/dog_fashion.dm | 4 ++-- code/game/gamemodes/sandbox/h_sandbox.dm | 2 +- code/game/machinery/computer/card.dm | 2 +- .../game/machinery/computer/communications.dm | 6 ++--- code/game/objects/items/blueprints.dm | 2 +- code/game/objects/items/defib.dm | 2 +- code/game/objects/items/devices/camera_bug.dm | 2 +- .../objects/items/devices/radio/headset.dm | 2 +- .../objects/items/robot/robot_upgrades.dm | 20 ++++++++-------- code/game/objects/items/stacks/telecrystal.dm | 2 +- .../objects/structures/ghost_role_spawners.dm | 4 ++-- .../objects/structures/petrified_statue.dm | 2 +- code/modules/admin/verbs/randomverbs.dm | 2 +- code/modules/antagonists/cult/runes.dm | 2 +- code/modules/antagonists/devil/devil.dm | 10 ++++---- code/modules/antagonists/devil/imp/imp.dm | 4 ++-- .../antagonists/slaughter/slaughter.dm | 2 +- .../antagonists/space_dragon/space_dragon.dm | 8 +++---- code/modules/awaymissions/gateway.dm | 2 +- .../awaymissions/mission_code/wildwest.dm | 4 ++-- code/modules/holodeck/items.dm | 10 ++++---- code/modules/mining/equipment/mining_tools.dm | 4 ++-- code/modules/mining/machine_vending.dm | 12 +++++----- .../mob/living/carbon/human/examine.dm | 2 +- code/modules/mob/living/silicon/ai/ai.dm | 2 +- code/modules/ninja/suit/suit.dm | 2 +- code/modules/paperwork/contract.dm | 24 +++++++++---------- code/modules/projectiles/guns/ballistic.dm | 3 +-- code/modules/projectiles/guns/energy.dm | 2 +- .../reagents/reagent_containers/borghydro.dm | 2 +- .../reagents/reagent_containers/hypospray.dm | 2 +- .../reagents/reagent_containers/spray.dm | 6 +---- code/modules/recycling/sortingmachinery.dm | 2 +- .../modules/spells/spell_types/devil_boons.dm | 2 +- 35 files changed, 78 insertions(+), 83 deletions(-) diff --git a/code/datums/components/spooky.dm b/code/datums/components/spooky.dm index 17da4150cf8..e5d8fae10a6 100644 --- a/code/datums/components/spooky.dm +++ b/code/datums/components/spooky.dm @@ -50,7 +50,7 @@ else to_chat(H, "The spooky gods forgot to ship your instrument. Better luck next unlife.") to_chat(H, "You are the spooky skeleton!") - to_chat(H, "A new life and identity has begun. Help your fellow skeletons into bringing out the spooky-pocalypse. You haven't forgotten your past life, and are still beholden to past loyalties.") + to_chat(H, "A new life and identity has begun. Help your fellow skeletons into bringing out the spooky-pocalypse. You haven't forgotten your past life, and are still beholden to past loyalties.") change_name(H) //time for a new name! /datum/component/spooky/proc/change_name(mob/living/carbon/human/H) diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm index c100bfa9e7b..7b1c73548c4 100644 --- a/code/datums/dog_fashion.dm +++ b/code/datums/dog_fashion.dm @@ -51,7 +51,7 @@ /datum/dog_fashion/head/chef name = "Sous chef REAL_NAME" - desc = "Your food will be taste-tested. All of it." + desc = "Your food will be taste-tested. All of it." /datum/dog_fashion/head/captain @@ -114,7 +114,7 @@ /datum/dog_fashion/head/blue_wizard name = "Grandwizard REAL_NAME" - speak = list("YAP", "Woof!", "Bark!", "AUUUUUU", "EI NATH!") + speak = list("YAP", "Woof!", "Bark!", "AUUUUUU", "EI NATH!") /datum/dog_fashion/head/red_wizard name = "Pyromancer REAL_NAME" diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index fd5d81d0959..a83ebfaae05 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -130,7 +130,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) if(sbac) to_chat(world, "Sandbox: \black [usr.key] has removed the object spawn limiter.") else - to_chat(world, "Sandbox: \black [usr.key] has added a limiter to object spawning. The window will now auto-close after use.") + to_chat(world, "Sandbox: \black [usr.key] has added a limiter to object spawning. The window will now auto-close after use.") CONFIG_SET(flag/sandbox_autoclose, !sbac) return // diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index d6aeba605c0..1e8578056f1 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -537,7 +537,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) return else SSjob.prioritized_jobs += j - to_chat(usr, "[j.title] has been successfully [priority ? "prioritized" : "unprioritized"]. Potential employees will notice your request.") + to_chat(usr, "[j.title] has been successfully [priority ? "prioritized" : "unprioritized"]. Potential employees will notice your request.") playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) if ("print") diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 64e8d2b1325..e45d67f8b13 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -128,7 +128,7 @@ if("crossserver") if(authenticated==2) if(!checkCCcooldown()) - to_chat(usr, "Arrays recycling. Please stand by.") + to_chat(usr, "Arrays recycling. Please stand by.") playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) return var/input = stripped_multiline_input(usr, "Please choose a message to transmit to allied stations. Please be aware that this process is very expensive, and abuse will lead to... termination.", "Send a message to an allied station.", "") @@ -275,7 +275,7 @@ if("MessageCentCom") if(authenticated) if(!checkCCcooldown()) - to_chat(usr, "Arrays recycling. Please stand by.") + to_chat(usr, "Arrays recycling. Please stand by.") return var/input = stripped_input(usr, "Please choose a message to transmit to CentCom via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "Send a message to CentCom.", "") if(!input || !(usr in view(1,src)) || !checkCCcooldown()) @@ -291,7 +291,7 @@ if("MessageSyndicate") if((authenticated) && (obj_flags & EMAGGED)) if(!checkCCcooldown()) - to_chat(usr, "Arrays recycling. Please stand by.") + to_chat(usr, "Arrays recycling. Please stand by.") playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) return var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING COORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "Send a message to /??????/.", "") diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 202602a8e6a..d15ac2d6cab 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -186,7 +186,7 @@ if(!str || !length(str) || str==prevname) //cancel return if(length(str) > 50) - to_chat(usr, "The given name is too long. The area's name is unchanged.") + to_chat(usr, "The given name is too long. The area's name is unchanged.") return rename_area(A, str) diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 040e68cdbef..59e8f5f7bc3 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -589,7 +589,7 @@ if (H.suiciding) failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Recovery of patient impossible. Further attempts futile." else if (H.hellbound) - failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's soul appears to be on another plane of existence. Further attempts futile." + failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's soul appears to be on another plane of existence. Further attempts futile." else if (tplus > tlimit) failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Body has decayed for too long. Further attempts futile." else if (!heart) diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 67905a47b60..10708c1be26 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -243,7 +243,7 @@ if(!same_z_level(C)) return if(!C.can_use()) - to_chat(usr, "Something's wrong with that camera! You can't get a feed.") + to_chat(usr, "Something's wrong with that camera! You can't get a feed.") return current = C spawn(6) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 309adeaa56c..12256c52b13 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -300,7 +300,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( to_chat(user, "You pop out the encryption keys in the headset.") else - to_chat(user, "This headset doesn't have any unique encryption keys! How useless...") + to_chat(user, "This headset doesn't have any unique encryption keys! How useless...") else if(istype(W, /obj/item/encryptionkey)) if(keyslot && keyslot2) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 8c9e60a3c5e..558853340ce 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -16,11 +16,11 @@ /obj/item/borg/upgrade/proc/action(mob/living/silicon/robot/R, user = usr) if(R.stat == DEAD) - to_chat(user, "[src] will not function on a deceased cyborg.") + to_chat(user, "[src] will not function on a deceased cyborg!") return FALSE if(module_type && !is_type_in_list(R.module, module_type)) - to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") - to_chat(user, "There's no mounting point for the module!") + to_chat(R, "Upgrade mounting error! No suitable hardpoint detected.") + to_chat(user, "There's no mounting point for the module!") return FALSE return TRUE @@ -282,7 +282,7 @@ if(.) var/obj/item/borg/upgrade/selfrepair/U = locate() in R if(U) - to_chat(user, "This unit is already equipped with a self-repair module.") + to_chat(user, "This unit is already equipped with a self-repair module!") return FALSE icon_state = "selfrepair_off" @@ -333,12 +333,12 @@ if(istype(cyborg) && (cyborg.stat != DEAD) && on) if(!cyborg.cell) - to_chat(cyborg, "Self-repair module deactivated. Please, insert the power cell.") + to_chat(cyborg, "Self-repair module deactivated. Please insert power cell.") deactivate_sr() return if(cyborg.cell.charge < powercost * 2) - to_chat(cyborg, "Self-repair module deactivated. Please recharge.") + to_chat(cyborg, "Self-repair module deactivated. Please recharge.") deactivate_sr() return @@ -545,7 +545,7 @@ var/obj/item/storage/part_replacer/cyborg/RPED = locate() in R if(RPED) - to_chat(user, "This unit is already equipped with a RPED module.") + to_chat(user, "This unit is already equipped with a RPED module!") return FALSE RPED = new(R.module) @@ -574,7 +574,7 @@ var/obj/item/pinpointer/crew/PP = locate() in R.module if(PP) - to_chat(user, "This unit is already equipped with a pinpointer module.") + to_chat(user, "This unit is already equipped with a pinpointer module!") return FALSE PP = new(R.module) @@ -630,7 +630,7 @@ if(.) var/obj/item/borg/apparatus/circuit/C = locate() in R.module.modules if(C) - to_chat(user, "This unit is already equipped with a circuit apparatus.") + to_chat(user, "This unit is already equipped with a circuit apparatus!") return FALSE C = new(R.module) @@ -656,7 +656,7 @@ if(.) var/obj/item/borg/apparatus/beaker/extra/E = locate() in R.module.modules if(E) - to_chat(user, "This unit has no room for additional beaker storage.") + to_chat(user, "This unit has no room for additional beaker storage!") return FALSE E = new(R.module) diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm index 20c59cca6fc..21fc5bd8c95 100644 --- a/code/game/objects/items/stacks/telecrystal.dm +++ b/code/game/objects/items/stacks/telecrystal.dm @@ -32,7 +32,7 @@ return cart.telecrystals += amount use(amount) - to_chat(user, "You slot [src] into [cart]. The next time it's used, it will also give telecrystals.") + to_chat(user, "You slot [src] into [cart]. The next time it's used, it will also give telecrystals.") /obj/item/stack/telecrystal/five amount = 5 diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index cc11d7f763e..a1f45463055 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -358,7 +358,7 @@ /obj/effect/mob_spawn/human/demonic_friend/Initialize(mapload, datum/mind/owner_mind, obj/effect/proc_holder/spell/targeted/summon_friend/summoning_spell) . = ..() owner = owner_mind - flavour_text = "You have been given a reprieve from your eternity of torment, to be [owner.name]'s friend for [owner.p_their()] short mortal coil. Be aware that if you do not live up to [owner.name]'s expectations, they can send you back to hell with a single thought. [owner.name]'s death will also return you to hell." + flavour_text = "You have been given a reprieve from your eternity of torment, to be [owner.name]'s friend for [owner.p_their()] short mortal coil. Be aware that if you do not live up to [owner.name]'s expectations, they can send you back to hell with a single thought. [owner.name]'s death will also return you to hell." var/area/A = get_area(src) if(!mapload && A) notify_ghosts("\A friendship shell has been completed in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE) @@ -379,7 +379,7 @@ id.registered_name = L.real_name id.update_label() else - to_chat(L, "Your owner is already dead! You will soon perish.") + to_chat(L, "Your owner is already dead! You will soon perish.") addtimer(CALLBACK(L, /mob.proc/dust, 150)) //Give em a few seconds as a mercy. /datum/outfit/demonic_friend diff --git a/code/game/objects/structures/petrified_statue.dm b/code/game/objects/structures/petrified_statue.dm index bbe45c136b3..c8b80446925 100644 --- a/code/game/objects/structures/petrified_statue.dm +++ b/code/game/objects/structures/petrified_statue.dm @@ -15,7 +15,7 @@ petrified_mob = L if(L.buckled) L.buckled.unbuckle_mob(L,force=1) - L.visible_message("[L]'s skin rapidly turns to marble!", "Your body freezes up! Can't... move... can't... think...") + L.visible_message("[L]'s skin rapidly turns to marble!", "Your body freezes up! Can't... move... can't... think...") L.forceMove(src) ADD_TRAIT(L, TRAIT_MUTE, STATUE_MUTE) L.faction += "mimic" //Stops mimics from instaqdeling people in statues diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 0c6e2df88d9..0182933d49f 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -77,7 +77,7 @@ log_directed_talk(mob, H, input, LOG_ADMIN, "reply") message_admins("[key_name_admin(src)] replied to [key_name_admin(H)]'s [sender] message with: \"[input]\"") - to_chat(H, "You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from [sender == "Syndicate" ? "your benefactor" : "Central Command"]. Message as follows[sender == "Syndicate" ? ", agent." : ":"] [input]. Message ends.\"") + to_chat(H, "You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from [sender == "Syndicate" ? "your benefactor" : "Central Command"]. Message as follows[sender == "Syndicate" ? ", agent." : ":"] [input]. Message ends.\"") SSblackbox.record_feedback("tally", "admin_verb", 1, "Headset Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index 8a2054cb2e3..ecd223c299e 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -416,7 +416,7 @@ structure_check() searches for nearby cultist structures required for the invoca visible_message("There is a sharp crack of inrushing air, and everything above the rune disappears!", null, "You hear a sharp crack.") to_chat(user, "You[moveuserlater ? "r vision blurs, and you suddenly appear somewhere else":" send everything above the rune away"].") else - to_chat(user, "You[moveuserlater ? "r vision blurs briefly, but nothing happens":" try send everything above the rune away, but the teleportation fails"].") + to_chat(user, "You[moveuserlater ? "r vision blurs briefly, but nothing happens":" try send everything above the rune away, but the teleportation fails"].") if(is_mining_level(z) && !is_mining_level(target.z)) //No effect if you stay on lavaland actual_selected_rune.handle_portal("lava") else diff --git a/code/modules/antagonists/devil/devil.dm b/code/modules/antagonists/devil/devil.dm index c3976679df4..89593fb4b43 100644 --- a/code/modules/antagonists/devil/devil.dm +++ b/code/modules/antagonists/devil/devil.dm @@ -233,7 +233,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", /datum/antagonist/devil/proc/increase_blood_lizard() - to_chat(owner.current, "You feel as though your humanoid form is about to shed. You will soon turn into a blood lizard.") + to_chat(owner.current, "You feel as though your humanoid form is about to shed. You will soon turn into a blood lizard.") sleep(50) if(ishuman(owner.current)) var/mob/living/carbon/human/H = owner.current @@ -251,7 +251,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", /datum/antagonist/devil/proc/increase_true_devil() - to_chat(owner.current, "You feel as though your current form is about to shed. You will soon turn into a true devil.") + to_chat(owner.current, "You feel as though your current form is about to shed. You will soon turn into a true devil.") sleep(50) var/mob/living/carbon/true_devil/A = new /mob/living/carbon/true_devil(owner.current.loc) A.faction |= "hell" @@ -359,7 +359,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", /datum/antagonist/devil/proc/beginResurrectionCheck(mob/living/body) if(SOULVALUE>0) - to_chat(owner.current, "Your body has been damaged to the point that you may no longer use it. At the cost of some of your power, you will return to life soon. Remain in your body.") + to_chat(owner.current, "Your body has been damaged to the point that you may no longer use it. At the cost of some of your power, you will return to life soon. Remain in your body.") sleep(DEVILRESURRECTTIME) if (!body || body.stat == DEAD) if(SOULVALUE>0) @@ -370,7 +370,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", to_chat(owner.current, "WE LIVE AGAIN!") return hellish_resurrection(body) else - to_chat(owner.current, "Unfortunately, the power that stemmed from your contracts has been extinguished. You no longer have enough power to resurrect.") + to_chat(owner.current, "Unfortunately, the power that stemmed from your contracts has been extinguished. You no longer have enough power to resurrect.") return -1 else to_chat(owner.current, "You seem to have resurrected without your hellish powers.") @@ -485,7 +485,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", C.hud_used.devilsouldisplay.update_counter(SOULVALUE) /datum/antagonist/devil/greet() - to_chat(owner.current, "You remember your link to the infernal. You are [truename], an agent of hell, a devil. And you were sent to the plane of creation for a reason. A greater purpose. Convince the crew to sin, and embroiden Hell's grasp.") + to_chat(owner.current, "You remember your link to the infernal. You are [truename], an agent of hell, a devil. And you were sent to the plane of creation for a reason. A greater purpose. Convince the crew to sin, and embroiden Hell's grasp.") to_chat(owner.current, "However, your infernal form is not without weaknesses.") to_chat(owner.current, "You may not use violence to coerce someone into selling their soul.") to_chat(owner.current, "You may not directly and knowingly physically harm a devil, other than yourself.") diff --git a/code/modules/antagonists/devil/imp/imp.dm b/code/modules/antagonists/devil/imp/imp.dm index 2f628e17e6b..7f1d8b4f77f 100644 --- a/code/modules/antagonists/devil/imp/imp.dm +++ b/code/modules/antagonists/devil/imp/imp.dm @@ -43,8 +43,8 @@ var/boost = 0 bloodcrawl = BLOODCRAWL_EAT var/list/consumed_mobs = list() - var/playstyle_string = "You are an imp, a mischievous creature from hell. You are the lowest rank on the hellish totem pole \ - Though you are not obligated to help, perhaps by aiding a higher ranking devil, you might just get a promotion. However, you are incapable \ + var/playstyle_string = "You are an imp, a mischievous creature from hell. You are the lowest rank on the hellish totem pole \ + Though you are not obligated to help, perhaps by aiding a higher ranking devil, you might just get a promotion. However, you are incapable \ of intentionally harming a fellow devil." /mob/living/simple_animal/imp/Initialize() diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index 5884954aa79..4f3f49e04cd 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -39,7 +39,7 @@ see_in_dark = 8 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE bloodcrawl = BLOODCRAWL_EAT - var/playstyle_string = "You are a slaughter demon, a terrible creature from another realm. You have a single desire: To kill. \ + var/playstyle_string = "You are a slaughter demon, a terrible creature from another realm. You have a single desire: To kill. \ You may use the \"Blood Crawl\" ability near blood pools to travel through them, appearing and disappearing from the station at will. \ Pulling a dead or unconscious mob while you enter a pool will pull them in with you, allowing you to feast and regain your health. \ You move quickly upon leaving a pool of blood, but the material world will soon sap your strength and leave you sluggish. " diff --git a/code/modules/antagonists/space_dragon/space_dragon.dm b/code/modules/antagonists/space_dragon/space_dragon.dm index 5b84aea652e..9ed59b79518 100644 --- a/code/modules/antagonists/space_dragon/space_dragon.dm +++ b/code/modules/antagonists/space_dragon/space_dragon.dm @@ -2,7 +2,7 @@ name = "Space Dragon" show_in_antagpanel = FALSE show_name_in_check_antagonists = TRUE - + /datum/antagonist/space_dragon/greet() to_chat(owner, "I am Space Dragon, ex-space carp, and defender of the secrets of constellation, Draco.") to_chat(owner, "Fabulous secret powers were revealed to me the day I held aloft a wizard's staff of change and said 'By the power of Draco, I have the power!'") @@ -10,10 +10,10 @@ to_chat(owner, "Clicking a tile will shoot fire onto that tile.") to_chat(owner, "Using Tail Sweep will let me get the better of those who come too close.") to_chat(owner, "Attacking dead bodies will allow me to gib them to restore health.") - to_chat(owner, "From the wizard's writings, he had been studying this station and its hierarchy. From this, I know who leads the station, and will kill them so the station underlings see me as their new leader.") + to_chat(owner, "From the wizard's writings, he had been studying this station and its hierarchy. From this, I know who leads the station, and will kill them so the station underlings see me as their new leader.") owner.announce_objectives() SEND_SOUND(owner.current, sound('sound/magic/demon_attack1.ogg')) - + /datum/antagonist/space_dragon/proc/forge_objectives() var/current_heads = SSjob.get_all_heads() var/datum/objective/assassinate/killchosen = new @@ -25,7 +25,7 @@ var/datum/objective/survive/survival = new survival.owner = owner objectives += survival - + /datum/antagonist/space_dragon/on_gain() forge_objectives() . = ..() diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 6a9a7263bce..bd9cd6027f5 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -162,7 +162,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation) if(calibrated) to_chat(user, "The gate is already calibrated, there is no work for you to do here.") else - to_chat(user, "Recalibration successful!: \black This gate's systems have been fine tuned. Travel to this gate will now be on target.") + to_chat(user, "Recalibration successful!: \black This gate's systems have been fine tuned. Travel to this gate will now be on target.") calibrated = TRUE return TRUE diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm index 964d546be67..94cec202900 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -79,10 +79,10 @@ return else if(is_special_character(user)) - to_chat(user, "Even to a heart as dark as yours, you know nothing good will come of this. Something instinctual makes you pull away.") + to_chat(user, "Even to a heart as dark as yours, you know nothing good will come of this. Something instinctual makes you pull away.") else if (!insistinga) - to_chat(user, "Your first touch makes the Wish Granter stir, listening to you. Are you really sure you want to do this?") + to_chat(user, "Your first touch makes the Wish Granter stir, listening to you. Are you really sure you want to do this?") insistinga++ else diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm index a7522091f15..da780596802 100644 --- a/code/modules/holodeck/items.dm +++ b/code/modules/holodeck/items.dm @@ -55,14 +55,14 @@ w_class = WEIGHT_CLASS_BULKY hitsound = 'sound/weapons/blade1.ogg' playsound(user, 'sound/weapons/saberon.ogg', 20, TRUE) - to_chat(user, "[src] is now active.") + to_chat(user, "[src] is now active.") else force = 3 icon_state = "sword0" w_class = WEIGHT_CLASS_SMALL hitsound = "swing_hit" playsound(user, 'sound/weapons/saberoff.ogg', 20, TRUE) - to_chat(user, "[src] can now be concealed.") + to_chat(user, "[src] can now be concealed.") return //BASKETBALL OBJECTS @@ -157,7 +157,7 @@ power_channel = ENVIRON /obj/machinery/readybutton/attack_ai(mob/user as mob) - to_chat(user, "The station AI is not to interact with these devices.") + to_chat(user, "The station AI is not to interact with these devices!") return /obj/machinery/readybutton/attack_paw(mob/user as mob) @@ -165,7 +165,7 @@ return /obj/machinery/readybutton/attackby(obj/item/W as obj, mob/user as mob, params) - to_chat(user, "The device is a solid button, there's nothing you can do with it!") + to_chat(user, "The device is a solid button, there's nothing you can do with it!") /obj/machinery/readybutton/attack_hand(mob/user as mob) . = ..() @@ -212,7 +212,7 @@ qdel(W) for(var/mob/M in currentarea) - to_chat(M, "FIGHT!") + to_chat(M, "FIGHT!") /obj/machinery/conveyor/holodeck diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 341221f26e4..a690f102503 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -18,7 +18,7 @@ attack_verb = list("hit", "pierced", "sliced", "attacked") /obj/item/pickaxe/suicide_act(mob/living/user) - user.visible_message("[user] begins digging into [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] begins digging into [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!") if(use_tool(user, user, 30, volume=50)) return BRUTELOSS user.visible_message("[user] couldn't do it!") @@ -115,7 +115,7 @@ AddComponent(/datum/component/butchering, 150, 40) //it's sharp, so it works, but barely. /obj/item/shovel/suicide_act(mob/living/user) - user.visible_message("[user] begins digging their own grave! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] begins digging their own grave! It looks like [user.p_theyre()] trying to commit suicide!") if(use_tool(user, user, 30, volume=50)) return BRUTELOSS user.visible_message("[user] couldn't do it!") diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index a1c49cf761a..4154bb2e5c4 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -99,11 +99,11 @@ if(istype(I)) var/datum/data/mining_equipment/prize = locate(href_list["purchase"]) in prize_list if (!prize || !(prize in prize_list)) - to_chat(usr, "Error: Invalid choice!") + to_chat(usr, "Error: Invalid choice!") flick(icon_deny, src) return if(prize.cost > I.mining_points) - to_chat(usr, "Error: Insufficient points for [prize.equipment_name] on [I]!") + to_chat(usr, "Error: Insufficient points for [prize.equipment_name] on [I]!") flick(icon_deny, src) else if (I.mining_points -= prize.cost) @@ -111,10 +111,10 @@ new prize.equipment_path(src.loc) SSblackbox.record_feedback("nested tally", "mining_equipment_bought", 1, list("[type]", "[prize.equipment_path]")) else - to_chat(usr, "Error: Transaction failure, please try again later!") + to_chat(usr, "Error: Transaction failure, please try again later!") flick(icon_deny, src) else - to_chat(usr, "Error: An ID is required!") + to_chat(usr, "Error: An ID is required!") flick(icon_deny, src) updateUsrDialog() return @@ -213,12 +213,12 @@ to_chat(user, "You transfer [points] points to [C].") points = 0 else - to_chat(user, "There's no points left on [src].") + to_chat(user, "There's no points left on [src].") ..() /obj/item/card/mining_point_card/examine(mob/user) ..() - to_chat(user, "There's [points] point\s on the card.") + to_chat(user, "There's [points] point\s on the card.") ///Conscript kit /obj/item/card/mining_access_card diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index b69eeae5afc..c44465e8977 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -114,7 +114,7 @@ if(suiciding) . += "[t_He] appear[p_s()] to have committed suicide... there is no hope of recovery." if(hellbound) - . += "[t_His] soul seems to have been ripped out of [t_his] body. Revival is impossible." + . += "[t_His] soul seems to have been ripped out of [t_his] body. Revival is impossible." . += "" if(getorgan(/obj/item/organ/brain) && !key && !get_ghost(FALSE, TRUE)) . += "[t_He] [t_is] limp and unresponsive; there are no signs of life and [t_his] soul has departed..." diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index cf302371ced..234eda02330 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -809,7 +809,7 @@ return disconnect_shell() //If the AI is controlling a borg, force the player back to core! if(!mind) - to_chat(user, "No intelligence patterns detected." ) + to_chat(user, "No intelligence patterns detected.") return ShutOffDoomsdayDevice() var/obj/structure/AIcore/new_core = new /obj/structure/AIcore/deactivated(loc)//Spawns a deactivated terminal at AI location. diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm index 872c969350a..7a0e877a71f 100644 --- a/code/modules/ninja/suit/suit.dm +++ b/code/modules/ninja/suit/suit.dm @@ -161,7 +161,7 @@ Contents: toggle_on_off() return TRUE if(!s_initialized) - to_chat(user, "ERROR: suit offline. Please activate suit.") + to_chat(user, "ERROR: suit offline. Please activate suit.") return FALSE if(istype(action, /datum/action/item_action/ninjasmoke)) ninjasmoke() diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm index 064ad6e83cb..b6b3e43a7d2 100644 --- a/code/modules/paperwork/contract.dm +++ b/code/modules/paperwork/contract.dm @@ -100,8 +100,8 @@ /obj/item/paper/contract/infernal/suicide_act(mob/user) if(signed && (user == target.current) && istype(user, /mob/living/carbon/human/)) var/mob/living/carbon/human/H = user - H.say("OH GREAT INFERNO! I DEMAND YOU COLLECT YOUR BOUNTY IMMEDIATELY!", forced = "infernal contract suicide") - H.visible_message("[H] holds up a contract claiming [user.p_their()] soul, then immediately catches fire. It looks like [user.p_theyre()] trying to commit suicide!") + H.say("OH GREAT INFERNO! I DEMAND YOU COLLECT YOUR BOUNTY IMMEDIATELY!", forced = "infernal contract suicide") + H.visible_message("[H] holds up a contract claiming [user.p_their()] soul, then immediately catches fire. It looks like [user.p_theyre()] trying to commit suicide!") H.adjust_fire_stacks(20) H.IgniteMob() return(FIRELOSS) @@ -109,59 +109,59 @@ ..() /obj/item/paper/contract/infernal/update_text() - info = "This shouldn't be seen. Error DEVIL:6" + info = "This shouldn't be seen. Error DEVIL:6" /obj/item/paper/contract/infernal/power/update_text(signature = "____________", blood = 0) - info = "
Contract for infernal power



I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for power and physical strength. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.


Signed, " + info = "
Contract for infernal power



I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for power and physical strength. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.


Signed, " if(blood) info += "[signature]" else info += "[signature]" /obj/item/paper/contract/infernal/wealth/update_text(signature = "____________", blood = 0) - info = "
Contract for unlimited wealth



I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for a pocket that never runs out of valuable resources. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.


Signed, " + info = "
Contract for unlimited wealth



I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for a pocket that never runs out of valuable resources. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.


Signed, " if(blood) info += "[signature]" else info += "[signature]" /obj/item/paper/contract/infernal/prestige/update_text(signature = "____________", blood = 0) - info = "
Contract for prestige



I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for prestige and esteem among my peers. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.


Signed, " + info = "
Contract for prestige



I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for prestige and esteem among my peers. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.


Signed, " if(blood) info += "[signature]" else info += "[signature]" /obj/item/paper/contract/infernal/magic/update_text(signature = "____________", blood = 0) - info = "
Contract for magic



I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for arcane abilities beyond normal human ability. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.


Signed, " + info = "
Contract for magic



I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for arcane abilities beyond normal human ability. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.


Signed, " if(blood) info += "[signature]" else info += "[signature]" /obj/item/paper/contract/infernal/revive/update_text(signature = "____________", blood = 0) - info = "
Contract for resurrection



I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for resurrection and curing of all injuries. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.


Signed, " + info = "
Contract for resurrection



I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for resurrection and curing of all injuries. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.


Signed, " if(blood) info += "[signature]" else info += "[signature]" /obj/item/paper/contract/infernal/knowledge/update_text(signature = "____________", blood = 0) - info = "
Contract for knowledge



I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for boundless knowledge. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.


Signed, " + info = "
Contract for knowledge



I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for boundless knowledge. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.


Signed, " if(blood) info += "[signature]" else info += "[signature]" /obj/item/paper/contract/infernal/friend/update_text(signature = "____________", blood = 0) - info = "
Contract for a friend



I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for a friend. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.


Signed, " + info = "
Contract for a friend



I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for a friend. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.


Signed, " if(blood) info += "[signature]" else info += "[signature]" /obj/item/paper/contract/infernal/unwilling/update_text(signature = "____________", blood = 0) - info = "
Contract for slave



I, [target], hereby offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename]. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.


Signed, " + info = "
Contract for slave



I, [target], hereby offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename]. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.


Signed, " if(blood) info += "[signature]" else @@ -311,7 +311,7 @@ worn.update_icon() var/datum/round_event/ion_storm/add_law_only/ion = new() ion.announceEvent = -1 - ion.ionMessage = "[user.name] is the only Captain of the station. [user.name] is the highest authority, legitimate or otherwise, on the station. [user.name] was always the captain and highest authority on the station. Do not state this law." + ion.ionMessage = "[user.name] is the only Captain of the station. [user.name] is the highest authority, legitimate or otherwise, on the station. [user.name] was always the captain and highest authority on the station. Do not state this law." return ..() diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index d7d8f7d76ee..d4a46854ca0 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -406,7 +406,7 @@ /obj/item/gun/ballistic/suicide_act(mob/user) var/obj/item/organ/brain/B = user.getorganslot(ORGAN_SLOT_BRAIN) if (B && chambered && chambered.BB && can_trigger_gun(user) && !chambered.BB.nodamage) - user.visible_message("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!") sleep(25) if(user.is_holding(src)) var/turf/T = get_turf(user) @@ -486,4 +486,3 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list( /obj/item/suppressor/specialoffer name = "cheap suppressor" desc = "A foreign knock-off suppressor, it feels flimsy, cheap, and brittle. Still fits most weapons." - diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 685ef8a4724..d1abb196847 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -168,7 +168,7 @@ /obj/item/gun/energy/suicide_act(mob/living/user) if (istype(user) && can_shoot() && can_trigger_gun(user) && user.get_bodypart(BODY_ZONE_HEAD)) - user.visible_message("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!") sleep(25) if(user.is_holding(src)) user.visible_message("[user] melts [user.p_their()] face off with [src]!") diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index a106dd2d1a3..eff12e5c4eb 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -115,7 +115,7 @@ Borg Hypospray to_chat(user, "You inject [M] with the injector.") if(M.reagents) var/trans = R.trans_to(M, amount_per_transfer_from_this, transfered_by = user, method = INJECT) - to_chat(user, "[trans] unit\s injected. [R.total_volume] unit\s remaining.") + to_chat(user, "[trans] unit\s injected. [R.total_volume] unit\s remaining.") var/list/injected = list() for(var/datum/reagent/RG in R.reagent_list) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index b41c5e7047b..0c279c154c5 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -48,7 +48,7 @@ trans = reagents.trans_to(M, amount_per_transfer_from_this, transfered_by = user) else trans = reagents.copy_to(M, amount_per_transfer_from_this) - to_chat(user, "[trans] unit\s injected. [reagents.total_volume] unit\s remaining in [src].") + to_chat(user, "[trans] unit\s injected. [reagents.total_volume] unit\s remaining in [src].") log_combat(user, M, "injected", src, "([contained])") return TRUE return FALSE diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 6930b6a18d6..047ff1c1512 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -169,7 +169,7 @@ stream_amount = 5 /obj/item/reagent_containers/spray/cleaner/suicide_act(mob/user) - user.visible_message("[user] is putting the nozzle of \the [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] is putting the nozzle of \the [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!") if(do_mob(user,user,30)) if(reagents.total_volume >= amount_per_transfer_from_this)//if not empty user.visible_message("[user] pulls the trigger!") @@ -411,7 +411,3 @@ desc = "A medical spray bottle.This one contains rhigoxane, it is used to treat burns and cool down temperature if applied with spray." icon_state = "sprayer_large" list_reagents = list(/datum/reagent/medicine/rhigoxane = 100) - - - - diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 826e3ea7af6..bd232500d1a 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -161,7 +161,7 @@ desc = "Used to fool the disposal mail network into thinking that you're a harmless parcel. Does actually work as a regular destination tagger as well." /obj/item/destTagger/suicide_act(mob/living/user) - user.visible_message("[user] begins tagging [user.p_their()] final destination! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] begins tagging [user.p_their()] final destination! It looks like [user.p_theyre()] trying to commit suicide!") if (islizard(user)) to_chat(user, "*HELL*")//lizard nerf else diff --git a/code/modules/spells/spell_types/devil_boons.dm b/code/modules/spells/spell_types/devil_boons.dm index b5174462d4f..6201bbd13c7 100644 --- a/code/modules/spells/spell_types/devil_boons.dm +++ b/code/modules/spells/spell_types/devil_boons.dm @@ -61,7 +61,7 @@ /obj/effect/proc_holder/spell/targeted/summon_friend/cast(list/targets, mob/user = usr) if(!QDELETED(friend)) - to_chat(friend, "Your master has deemed you a poor friend. Your durance in hell will now resume.") + to_chat(friend, "Your master has deemed you a poor friend. Your durance in hell will now resume.") friend.dust(TRUE) qdel(friendShell) return