diff --git a/code/controllers/subsystems/vote.dm b/code/controllers/subsystems/vote.dm index 61797555b5..102ffe5028 100644 --- a/code/controllers/subsystems/vote.dm +++ b/code/controllers/subsystems/vote.dm @@ -253,7 +253,7 @@ SUBSYSTEM_DEF(vote) log_vote(text) - to_world(span_filter_system(span_purple(span_bold("[text]") + "nType " + span_bold("vote") + " or click here to place your votes.\nYou have [config.vote_period / 10] seconds to vote."))) + to_world(span_filter_system(span_purple(span_bold("[text]") + "\nType " + span_bold("vote") + " or click here to place your votes.\nYou have [config.vote_period / 10] seconds to vote."))) if(vote_type == VOTE_CREW_TRANSFER || vote_type == VOTE_GAMEMODE || vote_type == VOTE_CUSTOM) world << sound('sound/ambience/alarm4.ogg', repeat = 0, wait = 0, volume = 50, channel = 3) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 1c8b1c481b..4eb8e4172e 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -904,7 +904,7 @@ var/datum/announcement/minor/admin_min_announcer = new set name="Toggle Persistent Data" config.persistence_disabled = !(config.persistence_disabled) if(!config.persistence_disabled) - to_world(span_world("Persistence is now enabled..")) + to_world(span_world("Persistence is now enabled.")) else to_world(span_world("Persistence is no longer enabled.")) message_admins(span_blue("[key_name_admin(usr)] toggled persistence to [config.persistence_disabled ? "Off" : "On"]."), 1) @@ -918,7 +918,7 @@ var/datum/announcement/minor/admin_min_announcer = new set name="Toggle Mapload Persistent Data" config.persistence_ignore_mapload = !(config.persistence_ignore_mapload) if(!config.persistence_ignore_mapload) - to_world(span_world("Persistence is now enabled..")) + to_world(span_world("Persistence is now enabled.")) else to_world(span_world("Persistence is no longer enabled.")) message_admins(span_blue("[key_name_admin(usr)] toggled persistence to [config.persistence_ignore_mapload ? "Off" : "On"]."), 1) diff --git a/code/modules/admin/admin_tools.dm b/code/modules/admin/admin_tools.dm index b0970849c8..323d046a8d 100644 --- a/code/modules/admin/admin_tools.dm +++ b/code/modules/admin/admin_tools.dm @@ -8,7 +8,7 @@ dat += span_bold("Viewing attack logs of [M]") + " - (Played by ([key_name(M)]).
" if(M.mind) dat += span_bold("Current Antag?:") + " [(M.mind.special_role)?"Yes":"No"]
" - dat += "
Note: This is arranged from earliest to latest.

" + dat += "
" + span_bold("Note:") + " This is arranged from earliest to latest.

" if(!isemptylist(M.attack_log)) @@ -39,7 +39,7 @@ dat += span_bold("Viewing say and emote logs of [M]") + " - (Played by ([key_name(M)]).
" if(M.mind) dat += span_bold("Current Antag?:") + " [(M.mind.special_role)?"Yes":"No"]
" - dat += "
Note: This is arranged from earliest to latest.

" + dat += "
" + span_bold("Note:") + " This is arranged from earliest to latest.

" if(!isemptylist(M.dialogue_log)) dat += "
" diff --git a/code/modules/client/preference_setup/general/06_flavor.dm b/code/modules/client/preference_setup/general/06_flavor.dm index e6e496ba3f..334fd413fd 100644 --- a/code/modules/client/preference_setup/general/06_flavor.dm +++ b/code/modules/client/preference_setup/general/06_flavor.dm @@ -64,11 +64,11 @@ switch(href_list["flavor_text"]) if("open") if("general") - var/msg = strip_html_simple(tgui_input_text(usr,"Give a general description of your character. This will be shown regardless of clothings. Put in a single space to make blank.","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]]), multiline = TRUE, prevent_enter = TRUE)) //VOREStation Edit: separating out OOC notes + var/msg = strip_html_simple(tgui_input_text(user,"Give a general description of your character. This will be shown regardless of clothings. Put in a single space to make blank.","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]]), multiline = TRUE, prevent_enter = TRUE)) //VOREStation Edit: separating out OOC notes if(CanUseTopic(user) && msg) pref.flavor_texts[href_list["flavor_text"]] = msg else - var/msg = strip_html_simple(tgui_input_text(usr,"Set the flavor text for your [href_list["flavor_text"]]. Put in a single space to make blank.","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]]), multiline = TRUE, prevent_enter = TRUE)) + var/msg = strip_html_simple(tgui_input_text(user,"Set the flavor text for your [href_list["flavor_text"]]. Put in a single space to make blank.","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]]), multiline = TRUE, prevent_enter = TRUE)) if(CanUseTopic(user) && msg) pref.flavor_texts[href_list["flavor_text"]] = msg SetFlavorText(user) @@ -78,23 +78,23 @@ switch(href_list["flavour_text_robot"]) if("open") if("Default") - var/msg = strip_html_simple(tgui_input_text(usr,"Set the default flavour text for your robot. It will be used for any module without individual setting. Put in a single space to make blank.","Flavour Text",html_decode(pref.flavour_texts_robot["Default"]), multiline = TRUE, prevent_enter = TRUE)) + var/msg = strip_html_simple(tgui_input_text(user,"Set the default flavour text for your robot. It will be used for any module without individual setting. Put in a single space to make blank.","Flavour Text",html_decode(pref.flavour_texts_robot["Default"]), multiline = TRUE, prevent_enter = TRUE)) if(CanUseTopic(user) && msg) pref.flavour_texts_robot[href_list["flavour_text_robot"]] = msg else - var/msg = strip_html_simple(tgui_input_text(usr,"Set the flavour text for your robot with [href_list["flavour_text_robot"]] module. If you leave this blank, default flavour text will be used for this module. Put in a single space to make blank.","Flavour Text",html_decode(pref.flavour_texts_robot[href_list["flavour_text_robot"]]), multiline = TRUE, prevent_enter = TRUE)) + var/msg = strip_html_simple(tgui_input_text(user,"Set the flavour text for your robot with [href_list["flavour_text_robot"]] module. If you leave this blank, default flavour text will be used for this module. Put in a single space to make blank.","Flavour Text",html_decode(pref.flavour_texts_robot[href_list["flavour_text_robot"]]), multiline = TRUE, prevent_enter = TRUE)) if(CanUseTopic(user) && msg) pref.flavour_texts_robot[href_list["flavour_text_robot"]] = msg SetFlavourTextRobot(user) return TOPIC_HANDLED else if(href_list["custom_link"]) - var/new_link = strip_html_simple(tgui_input_text(usr, "Enter a link to add on to your examine text! This should be a related image link/gallery, or things like your F-list. This is not the place for memes.", "Custom Link" , html_decode(pref.custom_link), max_length = 100, encode = TRUE, prevent_enter = TRUE)) - if(new_link && CanUseTopic(usr)) + var/new_link = strip_html_simple(tgui_input_text(user, "Enter a link to add on to your examine text! This should be a related image link/gallery, or things like your F-list. This is not the place for memes.", "Custom Link" , html_decode(pref.custom_link), max_length = 100, encode = TRUE, prevent_enter = TRUE)) + if(new_link && CanUseTopic(user)) if(length(new_link) > 100) - to_chat(usr, span_warning("Your entry is too long, it must be 100 characters or less.")) + to_chat(user, span_warning("Your entry is too long, it must be 100 characters or less.")) return pref.custom_link = new_link - log_admin("[usr]/[usr.ckey] set their custom link to [pref.custom_link]") + log_admin("[user]/[user.ckey] set their custom link to [pref.custom_link]") return ..() diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index c19b393af7..41a01ee608 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -357,12 +357,12 @@ for (var/O in items_counts) var/N = items_counts[O] if (!(O in items_measures)) - dat += {span_bold("[capitalize(O)]:") + " [N] [lowertext(O)]\s
"} + dat += span_bold("[capitalize(O)]:") + " [N] [lowertext(O)]\s
" else if (N==1) - dat += {span_bold("[capitalize(O)]:") + " [N] [items_measures[O]]
"} + dat += span_bold("[capitalize(O)]:") + " [N] [items_measures[O]]
" else - dat += {span_bold("[capitalize(O)]:") + " [N] [items_measures_p[O]]
"} + dat += span_bold("[capitalize(O)]:") + " [N] [items_measures_p[O]]
" for (var/datum/reagent/R in reagents.reagent_list) var/display_name = R.name @@ -370,12 +370,12 @@ display_name = "Hotsauce" if (R.id == "frostoil") display_name = "Coldsauce" - dat += {span_bold("[display_name]:") + " [R.volume] unit\s
"} + dat += span_bold("[display_name]:") + " [R.volume] unit\s
" if (items_counts.len==0 && reagents.reagent_list.len==0) - dat = {span_bold("The microwave is empty") + "
"} + dat = span_bold("The microwave is empty") + "
" else - dat = {span_bold("Ingredients:") + "
[dat]"} + dat = span_bold("Ingredients:") + "
[dat]" dat += {"

\ Turn on!
\ Eject ingredients!
\ diff --git a/code/modules/lore_codex/lore_data_vr/important_locations.dm b/code/modules/lore_codex/lore_data_vr/important_locations.dm index 7e2b14d880..ddf3d4092c 100644 --- a/code/modules/lore_codex/lore_data_vr/important_locations.dm +++ b/code/modules/lore_codex/lore_data_vr/important_locations.dm @@ -41,14 +41,14 @@ /datum/lore/codex/page/virgo_one/add_content() name = "Virgo 1 (Hot-Ice Giant)" keywords += list("Virgo 1") - data = "Virgo 1 is a tidally locked hot ice giant located closest to the star. Temperatures soar and drop between 490�K and 120�K. Winds on the planet often surpass \ + data = "Virgo 1 is a tidally locked hot ice giant located closest to the star. Temperatures soar and drop between 490°K and 120°K. Winds on the planet often surpass \ supersonic speeds." /datum/lore/codex/page/virgo_two/add_content() name = "Virgo 2 (Metal-Rich Planet)" keywords += list("Virgo 2") data = "The second closest planet to [quick_link("Virgo-Erigone")], this planet has a high concentration of minerals inside its crust, as well as active volcanism and plate tectonics. \ - The temperature on the surface can reach up to 405 degrees kelvin (132�C) due to the relatively high albedo of the surface, which has deterred most people from the planet, except for two [quick_link("TSC", "TSCs")], \ + The temperature on the surface can reach up to 405 degrees kelvin (132°C) due to the relatively high albedo of the surface, which has deterred most people from the planet, except for two [quick_link("TSC", "TSCs")], \ Greyson Manufactories and [quick_link("Xion Manufacturing Group")]. In orbit, the two companies each have a space station, used to coordinate and \ control their stations on the surface without having to suffer the intense heat. Xion's station also doubles as a control and oversight facility for their \ [quick_link("drones","autonomous mining drones")].\ @@ -88,7 +88,7 @@ /datum/lore/codex/page/virgo_prime/add_content() // Virgo 4 technically. name = "Virgo 4 / Virgo-Prime (Terrestrial Planet)" keywords += list("Virgo 4","Virgo-Prime") - data = "Virgo 4, also known as Virgo-Prime, is the fourth planet of Virgo-Eirgone. Although primarily desert, temperatures linger around only 287 kelvin (~14�C). \ + data = "Virgo 4, also known as Virgo-Prime, is the fourth planet of Virgo-Eirgone. Although primarily desert, temperatures linger around only 287 kelvin (~14°C). \ It is the only planet in the system with an environment that supports oxygen-breathing lifeforms. \

\ While being about the size of Earth, it is home to only about 750,000 known residents, most of whom live \ @@ -103,7 +103,7 @@ /datum/lore/codex/page/virgo_five/add_content() name = "Virgo 5 (Rocky Ice Planet)" keywords += list("Virgo 5") - data = "Virgo 5 is a cold, inhospitable wasteland contaminated with toxic phoron-based compounds. At temperatures around 213 kelvin (-60�C), \ + data = "Virgo 5 is a cold, inhospitable wasteland contaminated with toxic phoron-based compounds. At temperatures around 213 kelvin (-60°C), \ it can support only the most hardy of phoron-based life, such as space carp, which are unaffected by the frigid temperatures or deadly \ atmosphere. Scientists believe this planet was once closer to its host star, but over time was pushed out beyond the habitable zone by \ other large planets." @@ -112,7 +112,7 @@ name = "The Outer Worlds" keywords += list("The Outer Worlds") data = "The last three planets in the system are two small rocky worlds, Virgo 6 and 7, and finally Virgo 8 which is a frozen gas giant \ - whose temperatures reach only 49�K. The planet has several moons, but none of these worlds are of any significance. Virgo 6 and 7, as well \ + whose temperatures reach only 49°K. The planet has several moons, but none of these worlds are of any significance. Virgo 6 and 7, as well \ as 8's moons have no substantial deposits of any useful minerals, nor do they have an abundance of phoron. They are left largely ignored by \ the local [quick_link("TSC", "TSCs")], though this also makes them a safe haven for various pirate and smuggler stations." diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index f1877533ae..8171c32f58 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -471,7 +471,7 @@ setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - visible_message(span_vwarning("[src] licks [tasted]!"),span_vnotice("You lick [tasted]. They taste rather like [tasted.get_taste_message()]."),span_bold("Slurp!")) + visible_message(span_vwarning("[src] licks [tasted]!"),span_vnotice("You lick [tasted]. They taste rather like [tasted.get_taste_message()]."),span_infoplain(span_bold("Slurp!"))) /mob/living/proc/get_taste_message(allow_generic = 1) @@ -510,7 +510,7 @@ return setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - visible_message(span_vwarning("[src] smells [smelled]!"),span_vnotice("You smell [smelled]. They smell like [smelled.get_smell_message()]."),span_bold("Sniff!")) + visible_message(span_vwarning("[src] smells [smelled]!"),span_vnotice("You smell [smelled]. They smell like [smelled.get_smell_message()]."),span_infoplain(span_bold("Sniff!"))) /mob/living/proc/get_smell_message(allow_generic = 1) if(!vore_smell && !allow_generic) diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index b0ef4ef3ae..8da9844d4e 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -694,10 +694,10 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", var/intent = "Examine" if(isliving(target)) - intent = tgui_alert(usr, "What do you want to do to them?","Query",list("Examine","Help Out","Devour")) + intent = tgui_alert(user, "What do you want to do to them?","Query",list("Examine","Help Out","Devour")) else if(istype(target, /obj/item)) - intent = tgui_alert(usr, "What do you want to do to that?","Query",list("Examine","Use Hand")) + intent = tgui_alert(user, "What do you want to do to that?","Query",list("Examine","Use Hand")) switch(intent) if("Examine") //Examine a mob inside another mob @@ -835,7 +835,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", if(host.stat) to_chat(user,span_warning("You can't do that in your state!")) return TRUE - var/obj/belly/choice = tgui_input_list(usr, "Move [target] where?","Select Belly", host.vore_organs) + var/obj/belly/choice = tgui_input_list(user, "Move [target] where?","Select Belly", host.vore_organs) if(!choice || !(target in host.vore_selected)) return TRUE to_chat(target,span_vwarning("You're squished from [host]'s [lowertext(host.vore_selected.name)] to their [lowertext(choice.name)]!")) @@ -910,30 +910,30 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", if(process_options.len) process_options += "Cancel" else - to_chat(usr, span_vwarning("You cannot instantly process [ourtarget].")) + to_chat(user, span_vwarning("You cannot instantly process [ourtarget].")) return - var/ourchoice = tgui_input_list(usr, "How would you prefer to process \the [target]? This will perform the given action instantly if the prey accepts.","Instant Process", process_options) + var/ourchoice = tgui_input_list(user, "How would you prefer to process \the [target]? This will perform the given action instantly if the prey accepts.","Instant Process", process_options) if(!ourchoice) return if(!ourtarget.client) - to_chat(usr, span_vwarning("You cannot instantly process [ourtarget].")) + to_chat(user, span_vwarning("You cannot instantly process [ourtarget].")) return var/obj/belly/b = ourtarget.loc switch(ourchoice) if("Digest") if(ourtarget.absorbed) - to_chat(usr, span_vwarning("\The [ourtarget] is absorbed, and cannot presently be digested.")) + to_chat(user, span_vwarning("\The [ourtarget] is absorbed, and cannot presently be digested.")) return - if(tgui_alert(ourtarget, "\The [usr] is attempting to instantly digest you. Is this something you are okay with happening to you?","Instant Digest", list("No", "Yes")) != "Yes") - to_chat(usr, span_vwarning("\The [ourtarget] declined your digest attempt.")) + if(tgui_alert(ourtarget, "\The [user] is attempting to instantly digest you. Is this something you are okay with happening to you?","Instant Digest", list("No", "Yes")) != "Yes") + to_chat(user, span_vwarning("\The [ourtarget] declined your digest attempt.")) to_chat(ourtarget, span_vwarning("You declined the digest attempt.")) return if(ourtarget.loc != b) - to_chat(usr, span_vwarning("\The [ourtarget] is no longer in \the [b].")) + to_chat(user, span_vwarning("\The [ourtarget] is no longer in \the [b].")) return - if(isliving(usr)) - var/mob/living/l = usr + if(isliving(user)) + var/mob/living/l = user var/thismuch = ourtarget.health + 100 if(ishuman(l)) var/mob/living/carbon/human/h = l @@ -949,29 +949,29 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", ourtarget.mind?.vore_death = TRUE b.handle_digestion_death(ourtarget) if("Absorb") - if(tgui_alert(ourtarget, "\The [usr] is attempting to instantly absorb you. Is this something you are okay with happening to you?","Instant Absorb", list("No", "Yes")) != "Yes") - to_chat(usr, span_vwarning("\The [ourtarget] declined your absorb attempt.")) + if(tgui_alert(ourtarget, "\The [user] is attempting to instantly absorb you. Is this something you are okay with happening to you?","Instant Absorb", list("No", "Yes")) != "Yes") + to_chat(user, span_vwarning("\The [ourtarget] declined your absorb attempt.")) to_chat(ourtarget, span_vwarning("You declined the absorb attempt.")) return if(ourtarget.loc != b) - to_chat(usr, span_vwarning("\The [ourtarget] is no longer in \the [b].")) + to_chat(user, span_vwarning("\The [ourtarget] is no longer in \the [b].")) return - if(isliving(usr)) - var/mob/living/l = usr + if(isliving(user)) + var/mob/living/l = user l.adjust_nutrition(ourtarget.nutrition) var/n = 0 - ourtarget.nutrition ourtarget.adjust_nutrition(n) b.absorb_living(ourtarget) if("Knockout") - if(tgui_alert(ourtarget, "\The [usr] is attempting to instantly make you unconscious, you will be unable until ejected from the pred. Is this something you are okay with happening to you?","Instant Knockout", list("No", "Yes")) != "Yes") - to_chat(usr, span_vwarning("\The [ourtarget] declined your knockout attempt.")) + if(tgui_alert(ourtarget, "\The [user] is attempting to instantly make you unconscious, you will be unable until ejected from the pred. Is this something you are okay with happening to you?","Instant Knockout", list("No", "Yes")) != "Yes") + to_chat(user, span_vwarning("\The [ourtarget] declined your knockout attempt.")) to_chat(ourtarget, span_vwarning("You declined the knockout attempt.")) return if(ourtarget.loc != b) - to_chat(usr, span_vwarning("\The [ourtarget] is no longer in \the [b].")) + to_chat(user, span_vwarning("\The [ourtarget] is no longer in \the [b].")) return ourtarget.AdjustSleeping(500000) - to_chat(ourtarget, span_vwarning("\The [usr] has put you to sleep, you will remain unconscious until ejected from the belly.")) + to_chat(ourtarget, span_vwarning("\The [user] has put you to sleep, you will remain unconscious until ejected from the belly.")) if("Cancel") return if("Health Check") @@ -979,7 +979,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", var/target_health = round((H.health/H.getMaxHealth())*100) var/condition var/condition_consequences - to_chat(usr, span_vwarning("\The [target] is at [target_health]% health.")) + to_chat(user, span_vwarning("\The [target] is at [target_health]% health.")) if(H.blinded) condition += "blinded" condition_consequences += "hear emotes" @@ -996,18 +996,18 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", condition += "sleeping" condition_consequences += "hear or do anything" if(condition) - to_chat(usr, span_vwarning("\The [target] is currently [condition], they will not be able to [condition_consequences].")) + to_chat(user, span_vwarning("\The [target] is currently [condition], they will not be able to [condition_consequences].")) return /datum/vore_look/proc/set_attr(mob/user, params) if(!host.vore_selected) - tgui_alert_async(usr, "No belly selected to modify.") + tgui_alert_async(user, "No belly selected to modify.") return FALSE var/attr = params["attribute"] switch(attr) if("b_name") - var/new_name = html_encode(tgui_input_text(usr,"Belly's new name:","New Name")) + var/new_name = html_encode(tgui_input_text(user,"Belly's new name:","New Name")) var/failure_msg if(length(new_name) > BELLIES_NAME_MAX || length(new_name) < BELLIES_NAME_MIN) @@ -1036,7 +1036,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", . = TRUE if("b_mode") var/list/menu_list = host.vore_selected.digest_modes.Copy() - var/new_mode = tgui_input_list(usr, "Choose Mode (currently [host.vore_selected.digest_mode])", "Mode Choice", menu_list) + var/new_mode = tgui_input_list(user, "Choose Mode (currently [host.vore_selected.digest_mode])", "Mode Choice", menu_list) if(!new_mode) return FALSE @@ -1045,7 +1045,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", . = TRUE if("b_addons") var/list/menu_list = host.vore_selected.mode_flag_list.Copy() - var/toggle_addon = tgui_input_list(usr, "Toggle Addon", "Addon Choice", menu_list) + var/toggle_addon = tgui_input_list(user, "Toggle Addon", "Addon Choice", menu_list) if(!toggle_addon) return FALSE host.vore_selected.mode_flags ^= host.vore_selected.mode_flag_list[toggle_addon] @@ -1054,7 +1054,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", if("b_item_mode") var/list/menu_list = host.vore_selected.item_digest_modes.Copy() - var/new_mode = tgui_input_list(usr, "Choose Mode (currently [host.vore_selected.item_digest_mode])", "Mode Choice", menu_list) + var/new_mode = tgui_input_list(user, "Choose Mode (currently [host.vore_selected.item_digest_mode])", "Mode Choice", menu_list) if(!new_mode) return FALSE @@ -1066,14 +1066,14 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", . = TRUE if("b_contamination_flavor") var/list/menu_list = contamination_flavors.Copy() - var/new_flavor = tgui_input_list(usr, "Choose Contamination Flavor Text Type (currently [host.vore_selected.contamination_flavor])", "Flavor Choice", menu_list) + var/new_flavor = tgui_input_list(user, "Choose Contamination Flavor Text Type (currently [host.vore_selected.contamination_flavor])", "Flavor Choice", menu_list) if(!new_flavor) return FALSE host.vore_selected.contamination_flavor = new_flavor . = TRUE if("b_contamination_color") var/list/menu_list = contamination_colors.Copy() - var/new_color = tgui_input_list(usr, "Choose Contamination Color (currently [host.vore_selected.contamination_color])", "Color Choice", menu_list) + var/new_color = tgui_input_list(user, "Choose Contamination Color (currently [host.vore_selected.contamination_color])", "Color Choice", menu_list) if(!new_color) return FALSE host.vore_selected.contamination_color = new_color @@ -1081,28 +1081,28 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", . = TRUE if("b_egg_type") var/list/menu_list = global_vore_egg_types.Copy() - var/new_egg_type = tgui_input_list(usr, "Choose Egg Type (currently [host.vore_selected.egg_type])", "Egg Choice", menu_list) + var/new_egg_type = tgui_input_list(user, "Choose Egg Type (currently [host.vore_selected.egg_type])", "Egg Choice", menu_list) if(!new_egg_type) return FALSE host.vore_selected.egg_type = new_egg_type . = TRUE if("b_desc") - var/new_desc = html_encode(tgui_input_text(usr,"Belly Description, '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. ([BELLIES_DESC_MAX] char limit):","New Description",host.vore_selected.desc, multiline = TRUE, prevent_enter = TRUE)) + var/new_desc = html_encode(tgui_input_text(user,"Belly Description, '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. ([BELLIES_DESC_MAX] char limit):","New Description",host.vore_selected.desc, multiline = TRUE, prevent_enter = TRUE)) if(new_desc) new_desc = readd_quotes(new_desc) if(length(new_desc) > BELLIES_DESC_MAX) - tgui_alert_async(usr, "Entered belly desc too long. [BELLIES_DESC_MAX] character limit.","Error") + tgui_alert_async(user, "Entered belly desc too long. [BELLIES_DESC_MAX] character limit.","Error") return FALSE host.vore_selected.desc = new_desc . = TRUE if("b_absorbed_desc") - var/new_desc = html_encode(tgui_input_text(usr,"Belly Description for absorbed prey, '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. ([BELLIES_DESC_MAX] char limit):","New Description",host.vore_selected.absorbed_desc, multiline = TRUE, prevent_enter = TRUE)) + var/new_desc = html_encode(tgui_input_text(user,"Belly Description for absorbed prey, '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. ([BELLIES_DESC_MAX] char limit):","New Description",host.vore_selected.absorbed_desc, multiline = TRUE, prevent_enter = TRUE)) if(new_desc) new_desc = readd_quotes(new_desc) if(length(new_desc) > BELLIES_DESC_MAX) - tgui_alert_async(usr, "Entered belly desc too long. [BELLIES_DESC_MAX] character limit.","Error") + tgui_alert_async(user, "Entered belly desc too long. [BELLIES_DESC_MAX] character limit.","Error") return FALSE host.vore_selected.absorbed_desc = new_desc . = TRUE @@ -1420,31 +1420,31 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", host.vore_selected.emote_lists = initial(host.vore_selected.emote_lists) . = TRUE if("b_verb") - var/new_verb = html_encode(tgui_input_text(usr,"New verb when eating (infinitive tense, e.g. nom or swallow):","New Verb")) + var/new_verb = html_encode(tgui_input_text(user,"New verb when eating (infinitive tense, e.g. nom or swallow):","New Verb")) if(length(new_verb) > BELLIES_NAME_MAX || length(new_verb) < BELLIES_NAME_MIN) - tgui_alert_async(usr, "Entered verb length invalid (must be longer than [BELLIES_NAME_MIN], no longer than [BELLIES_NAME_MAX]).","Error") + tgui_alert_async(user, "Entered verb length invalid (must be longer than [BELLIES_NAME_MIN], no longer than [BELLIES_NAME_MAX]).","Error") return FALSE host.vore_selected.vore_verb = new_verb . = TRUE if("b_release_verb") - var/new_release_verb = html_encode(tgui_input_text(usr,"New verb when releasing from stomach (e.g. expels or coughs or drops):","New Release Verb")) + var/new_release_verb = html_encode(tgui_input_text(user,"New verb when releasing from stomach (e.g. expels or coughs or drops):","New Release Verb")) if(length(new_release_verb) > BELLIES_NAME_MAX || length(new_release_verb) < BELLIES_NAME_MIN) - tgui_alert_async(usr, "Entered verb length invalid (must be longer than [BELLIES_NAME_MIN], no longer than [BELLIES_NAME_MAX]).","Error") + tgui_alert_async(user, "Entered verb length invalid (must be longer than [BELLIES_NAME_MIN], no longer than [BELLIES_NAME_MAX]).","Error") return FALSE host.vore_selected.release_verb = new_release_verb . = TRUE if("b_eating_privacy") - var/privacy_choice = tgui_input_list(usr, "Choose your belly-specific preference. Default uses global preference!", "Eating message privacy", list("default", "subtle", "loud"), "default") + var/privacy_choice = tgui_input_list(user, "Choose your belly-specific preference. Default uses global preference!", "Eating message privacy", list("default", "subtle", "loud"), "default") if(privacy_choice == null) return FALSE host.vore_selected.eating_privacy_local = privacy_choice . = TRUE if("b_silicon_belly") - var/belly_choice = tgui_alert(usr, "Choose whether you'd like your belly overlay to show from sleepers, \ + var/belly_choice = tgui_alert(user, "Choose whether you'd like your belly overlay to show from sleepers, \ normal vore bellies, or an average of the two. NOTE: This ONLY applies to silicons, not human mobs!", "Belly Overlay \ Preference", list("Sleeper", "Vorebelly", "Both")) @@ -1601,7 +1601,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", . = TRUE if("b_drainmode") var/list/menu_list = host.vore_selected.drainmodes.Copy() - var/new_drainmode = tgui_input_list(usr, "Choose Mode (currently [host.vore_selected.digest_mode])", "Mode Choice", menu_list) + var/new_drainmode = tgui_input_list(user, "Choose Mode (currently [host.vore_selected.digest_mode])", "Mode Choice", menu_list) if(!new_drainmode) return FALSE @@ -1626,12 +1626,12 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", if("b_escapable") if(host.vore_selected.escapable == 0) //Possibly escapable and special interactions. host.vore_selected.escapable = 1 - to_chat(usr,span_warning("Prey now have special interactions with your [lowertext(host.vore_selected.name)] depending on your settings.")) + to_chat(user,span_warning("Prey now have special interactions with your [lowertext(host.vore_selected.name)] depending on your settings.")) else if(host.vore_selected.escapable == 1) //Never escapable. host.vore_selected.escapable = 0 - to_chat(usr,span_warning("Prey will not be able to have special interactions with your [lowertext(host.vore_selected.name)].")) + to_chat(user,span_warning("Prey will not be able to have special interactions with your [lowertext(host.vore_selected.name)].")) else - tgui_alert_async(usr, "Something went wrong. Your stomach will now not have special interactions. Press the button enable them again and tell a dev.","Error") //If they somehow have a varable that's not 0 or 1 + tgui_alert_async(user, "Something went wrong. Your stomach will now not have special interactions. Press the button enable them again and tell a dev.","Error") //If they somehow have a varable that's not 0 or 1 host.vore_selected.escapable = 0 . = TRUE if("b_escapechance") @@ -1655,7 +1655,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", host.vore_selected.transferchance = sanitize_integer(transfer_chance_input, 0, 100, initial(host.vore_selected.transferchance)) . = TRUE if("b_transferlocation") - var/obj/belly/choice = tgui_input_list(usr, "Where do you want your [lowertext(host.vore_selected.name)] to lead if prey resists?","Select Belly", (host.vore_organs + "None - Remove" - host.vore_selected)) + var/obj/belly/choice = tgui_input_list(user, "Where do you want your [lowertext(host.vore_selected.name)] to lead if prey resists?","Select Belly", (host.vore_organs + "None - Remove" - host.vore_selected)) if(!choice) //They cancelled, no changes return FALSE @@ -1670,7 +1670,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", host.vore_selected.transferchance_secondary = sanitize_integer(transfer_secondary_chance_input, 0, 100, initial(host.vore_selected.transferchance_secondary)) . = TRUE if("b_transferlocation_secondary") - var/obj/belly/choice_secondary = tgui_input_list(usr, "Where do you want your [lowertext(host.vore_selected.name)] to alternately lead if prey resists?","Select Belly", (host.vore_organs + "None - Remove" - host.vore_selected)) + var/obj/belly/choice_secondary = tgui_input_list(user, "Where do you want your [lowertext(host.vore_selected.name)] to alternately lead if prey resists?","Select Belly", (host.vore_organs + "None - Remove" - host.vore_selected)) if(!choice_secondary) //They cancelled, no changes return FALSE @@ -1706,17 +1706,17 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", host.vore_selected.clear_preview(host) //Clears the stomach overlay. This is a failsafe but shouldn't occur. . = TRUE if("b_fullscreen_color") - var/newcolor = input(usr, "Choose a color.", "", host.vore_selected.belly_fullscreen_color) as color|null + var/newcolor = input(user, "Choose a color.", "", host.vore_selected.belly_fullscreen_color) as color|null if(newcolor) host.vore_selected.belly_fullscreen_color = newcolor . = TRUE if("b_fullscreen_color_secondary") - var/newcolor = input(usr, "Choose a color.", "", host.vore_selected.belly_fullscreen_color_secondary) as color|null + var/newcolor = input(user, "Choose a color.", "", host.vore_selected.belly_fullscreen_color_secondary) as color|null if(newcolor) host.vore_selected.belly_fullscreen_color_secondary = newcolor . = TRUE if("b_fullscreen_color_trinary") - var/newcolor = input(usr, "Choose a color.", "", host.vore_selected.belly_fullscreen_color_trinary) as color|null + var/newcolor = input(user, "Choose a color.", "", host.vore_selected.belly_fullscreen_color_trinary) as color|null if(newcolor) host.vore_selected.belly_fullscreen_color_trinary = newcolor . = TRUE @@ -1724,7 +1724,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", host.vore_selected.save_digest_mode = !host.vore_selected.save_digest_mode . = TRUE if("b_del") - var/alert = tgui_alert(usr, "Are you sure you want to delete your [lowertext(host.vore_selected.name)]?","Confirmation",list("Cancel","Delete")) + var/alert = tgui_alert(user, "Are you sure you want to delete your [lowertext(host.vore_selected.name)]?","Confirmation",list("Cancel","Delete")) if(alert != "Delete") return FALSE @@ -1758,7 +1758,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", if("b_belly_sprite_to_affect") if (istype(host, /mob/living/carbon/human)) var/mob/living/carbon/human/hhost = host - var/belly_choice = tgui_input_list(usr, "Which belly sprite do you want your [lowertext(hhost.vore_selected.name)] to affect?","Select Region", hhost.vore_icon_bellies) + var/belly_choice = tgui_input_list(user, "Which belly sprite do you want your [lowertext(hhost.vore_selected.name)] to affect?","Select Region", hhost.vore_icon_bellies) if(!belly_choice) //They cancelled, no changes return FALSE else @@ -1821,7 +1821,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", if("b_tail_to_change_to") if (istype(host, /mob/living/carbon/human)) var/mob/living/carbon/human/hhost = host - var/tail_choice = tgui_input_list(usr, "Which tail sprite do you want to use when your [lowertext(host.vore_selected.name)] is filled?","Select Sprite", global.tail_styles_list) + var/tail_choice = tgui_input_list(user, "Which tail sprite do you want to use when your [lowertext(host.vore_selected.name)] is filled?","Select Sprite", global.tail_styles_list) if(!tail_choice) //They cancelled, no changes return FALSE else @@ -1830,21 +1830,21 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", if("b_tail_color") if (istype(host, /mob/living/carbon/human)) var/mob/living/carbon/human/hhost = host - var/newcolor = input(usr, "Choose tail color.", "", hhost.vore_selected.tail_colouration) as color|null + var/newcolor = input(user, "Choose tail color.", "", hhost.vore_selected.tail_colouration) as color|null if(newcolor) hhost.vore_selected.tail_colouration = newcolor . = TRUE if("b_tail_color2") if (istype(host, /mob/living/carbon/human)) var/mob/living/carbon/human/hhost = host - var/newcolor = input(usr, "Choose tail secondary color.", "", hhost.vore_selected.tail_extra_overlay) as color|null + var/newcolor = input(user, "Choose tail secondary color.", "", hhost.vore_selected.tail_extra_overlay) as color|null if(newcolor) hhost.vore_selected.tail_extra_overlay = newcolor . = TRUE if("b_tail_color3") if (istype(host, /mob/living/carbon/human)) var/mob/living/carbon/human/hhost = host - var/newcolor = input(usr, "Choose tail tertiary color.", "", hhost.vore_selected.tail_extra_overlay2) as color|null + var/newcolor = input(user, "Choose tail tertiary color.", "", hhost.vore_selected.tail_extra_overlay2) as color|null if(newcolor) hhost.vore_selected.tail_extra_overlay2 = newcolor . = TRUE