diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index e474e79bdf5..905f580872d 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -377,7 +377,7 @@ SUBSYSTEM_DEF(ticker) for(var/i in GLOB.new_player_list) var/mob/dead/new_player/N = i if(N.new_character) - to_chat(N, "Captainship not forced on anyone.") + to_chat(N, "Captainship not forced on anyone.") CHECK_TICK /datum/controller/subsystem/ticker/proc/transfer_characters() diff --git a/code/datums/diseases/retrovirus.dm b/code/datums/diseases/retrovirus.dm index f7e9e2724c7..1541cdd5ab3 100644 --- a/code/datums/diseases/retrovirus.dm +++ b/code/datums/diseases/retrovirus.dm @@ -38,7 +38,7 @@ if (prob(8)) to_chat(affected_mob, "Your head hurts.") if (prob(9)) - to_chat(affected_mob, "You feel a tingling sensation in your chest.") + to_chat(affected_mob, "You feel a tingling sensation in your chest.") if (prob(9)) to_chat(affected_mob, "You feel angry.") if(2) @@ -50,7 +50,7 @@ if (prob(8)) to_chat(affected_mob, "Your skin feels loose.") if (prob(10)) - to_chat(affected_mob, "You feel very strange.") + to_chat(affected_mob, "You feel very strange.") if (prob(4)) to_chat(affected_mob, "You feel a stabbing pain in your head!") affected_mob.Unconscious(40) diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index bf8d642ba29..e061ffb19cd 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -134,7 +134,7 @@ RLD else if(silo_mats.on_hold()) if(user) - to_chat(user, "Mineral access is on hold, please contact the Quartermaster.") + to_chat(user, "Mineral access is on hold, please contact the quartermaster.") return FALSE if(!silo_mats.mat_container.has_materials(list(/datum/material/iron = 500), amount)) if(user) @@ -151,7 +151,7 @@ RLD else if(silo_mats.on_hold()) if(user) - to_chat(user, "Mineral access is on hold, please contact the Quartermaster.") + to_chat(user, "Mineral access is on hold, please contact the quartermaster.") return FALSE . = silo_mats.mat_container.has_materials(list(/datum/material/iron = 500), amount) if(!. && user) @@ -854,10 +854,10 @@ RLD ///index, used in the attack self to get the type. stored here since it doesnt change var/list/choices = list() ///index, used in the attack self to get the type. stored here since it doesnt change - var/list/name_to_type = list() + var/list/name_to_type = list() /// var/list/machinery_data = list("cost" = list(), "delay" = list()) - + /obj/item/construction/plumbing/attack_self(mob/user) ..() if(!choices.len) @@ -872,7 +872,7 @@ RLD var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) return - + blueprint = name_to_type[choice] playsound(src, 'sound/effects/pop.ogg', 50, FALSE) to_chat(user, "You change [name]s blueprint to '[choice]'.") diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 80e5a371985..7f5041ffeb5 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -293,7 +293,7 @@ GENE SCANNER max_damage += ", " //prelude the organ if we've already reported an organ max_damage += organ.name //this just slaps the organ name into the string of text else - max_damage = "\tNon-Functional Organs: " //our initial statement + max_damage = "\tNon-Functional Organs: " //our initial statement max_damage += organ.name else if(organ.damage > organ.high_threshold) report_organs = TRUE diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index dd79b223eee..c369d59f98d 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/code/game/objects/items/miscellaneous.dm @@ -129,7 +129,7 @@ /obj/item/choice_beacon/augments/spawn_option(obj/choice,mob/living/M) new choice(get_turf(M)) - to_chat(M, "You hear something crackle from the beacon for a moment before a voice speaks. \"Please stand by for a message from S.E.L.F. Message as follows: Item request received. Your package has been transported, use the autosurgeon supplied to apply the upgrade. Message ends.\"") + to_chat(M, "You hear something crackle from the beacon for a moment before a voice speaks. \"Please stand by for a message from S.E.L.F. Message as follows: Item request received. Your package has been transported, use the autosurgeon supplied to apply the upgrade. Message ends.\"") /obj/item/skub desc = "It's skub." diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index d584078d51d..ad80969dcdc 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/space_dragon/space_dragon.dm b/code/modules/antagonists/space_dragon/space_dragon.dm index 9ed59b79518..1f44b67b0e6 100644 --- a/code/modules/antagonists/space_dragon/space_dragon.dm +++ b/code/modules/antagonists/space_dragon/space_dragon.dm @@ -4,13 +4,13 @@ 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!'") - to_chat(owner, "The wizard was turned into the short-lived Pastry Cat while I became Space Dragon, the most powerful beast in the universe.") - 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, "I am Space Dragon, ex-space carp, and defender of the secrets of constellation, Draco.\n\ + 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!'\n\ + The wizard was turned into the short-lived Pastry Cat while I became Space Dragon, the most powerful beast in the universe.\n\ + Clicking a tile will shoot fire onto that tile.\n\ + Using Tail Sweep will let me get the better of those who come too close.\n\ + Attacking dead bodies will allow me to gib them to restore health.\n\ + 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')) diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index f60be2e06fd..e0df72bba81 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -163,8 +163,8 @@ throw_range = 3 /obj/item/grown/sunflower/attack(mob/M, mob/user) - to_chat(M, " [user] smacks you with a sunflower!FLOWER POWER") - to_chat(user, "Your sunflower's FLOWER POWERstrikes [M]!") + to_chat(M, "[user] smacks you with a sunflower!FLOWER POWER!") + to_chat(user, "Your sunflower's FLOWER POWER strikes [M]!") // Moonflower /obj/item/seeds/sunflower/moonflower diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index abd71576072..8e8d78c2628 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -319,13 +319,13 @@ /mob/living/simple_animal/bot/mulebot/proc/buzz(type) switch(type) if(SIGH) - audible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.") + audible_message("[src] makes a sighing buzz.") playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, FALSE) if(ANNOYED) - audible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.") + audible_message("[src] makes an annoyed buzzing sound.") playsound(loc, 'sound/machines/buzz-two.ogg', 50, FALSE) if(DELIGHT) - audible_message("[src] makes a delighted ping!", "You hear a ping.") + audible_message("[src] makes a delighted ping!") playsound(loc, 'sound/machines/ping.ogg', 50, FALSE) @@ -593,7 +593,7 @@ /mob/living/simple_animal/bot/mulebot/proc/at_target() if(!reached_target) radio_channel = RADIO_CHANNEL_SUPPLY //Supply channel - audible_message("[src] makes a chiming sound!", "You hear a chime.") + audible_message("[src] makes a chiming sound!") playsound(loc, 'sound/machines/chime.ogg', 50, FALSE) reached_target = 1 diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 1a18f8bfbbb..8bc0e407e36 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -579,7 +579,7 @@ return if(LAZYLEN(candidates)) var/mob/dead/observer/C = pick(candidates) - to_chat(M, "You have been noticed by a ghost, and it has possessed you!") + to_chat(M, "You have been noticed by a ghost and it has possessed you!") var/oldkey = M.key M.ghostize(0) M.key = C.key