diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm index 765db984e7d..55881a681de 100644 --- a/code/controllers/subsystem/tickets/tickets.dm +++ b/code/controllers/subsystem/tickets/tickets.dm @@ -186,7 +186,7 @@ SUBSYSTEM_DEF(tickets) /datum/controller/subsystem/tickets/proc/convert_to_other_ticket(ticketId) if(!check_rights(rights_needed)) return - if(alert("Are you sure to convert this ticket to an '[other_ticket_name]' ticket?",,"Yes","No") != "Yes") + if(alert("Are you sure to convert this ticket to an '[other_ticket_name]' ticket?", null,"Yes","No") != "Yes") return if(!other_ticket_system_staff_check()) return @@ -199,7 +199,7 @@ SUBSYSTEM_DEF(tickets) /datum/controller/subsystem/tickets/proc/other_ticket_system_staff_check() var/list/staff = staff_countup(other_ticket_permission) if(!staff[1]) - if(alert("No active staff online to answer the ticket. Are you sure you want to convert the ticket?",, "No", "Yes") != "Yes") + if(alert("No active staff online to answer the ticket. Are you sure you want to convert the ticket?", null, "No", "Yes") != "Yes") return FALSE return TRUE @@ -635,7 +635,7 @@ UI STUFF if(!check_rights(close_rights)) to_chat(usr, "Not enough rights to close this ticket.") return - if(alert("Are you sure? This will send a negative message.",,"Yes","No") != "Yes") + if(alert("Are you sure? This will send a negative message.", null,"Yes","No") != "Yes") return if(closeTicket(indexNum)) showDetailUI(usr, indexNum) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 252a60c8778..7e53e967d10 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -802,14 +802,14 @@ to_chat(usr, "This can only be used on instances of type /obj") return - var/action_type = alert("Strict type ([O.type]) or type and all subtypes?",,"Strict type","Type and subtypes","Cancel") + var/action_type = alert("Strict type ([O.type]) or type and all subtypes?", null,"Strict type","Type and subtypes","Cancel") if(action_type == "Cancel" || !action_type) return - if(alert("Are you really sure you want to delete all objects of type [O.type]?",,"Yes","No") != "Yes") + if(alert("Are you really sure you want to delete all objects of type [O.type]?", null,"Yes","No") != "Yes") return - if(alert("Second confirmation required. Delete?",,"Yes","No") != "Yes") + if(alert("Second confirmation required. Delete?", null,"Yes","No") != "Yes") return var/O_type = O.type diff --git a/code/datums/helper_datums/async_input.dm b/code/datums/helper_datums/async_input.dm index 8f3b833c52d..8709417240b 100644 --- a/code/datums/helper_datums/async_input.dm +++ b/code/datums/helper_datums/async_input.dm @@ -1,5 +1,5 @@ /proc/input_async(mob/user=usr, prompt, list/choices) - var/datum/async_input/A = new(choices, prompt, , user) + var/datum/async_input/A = new(choices, prompt, null, user) A.show() return A @@ -34,7 +34,7 @@ prompt = new_prompt window_id = new_window_id user = new_user - popup = new(user, window_id, , width, height, src) + popup = new(user, window_id, null, width, height, src) /datum/async_input/proc/close() if(popup) @@ -77,7 +77,7 @@ return dat /datum/async_input/proc/render_buttons() - return button("Submit", "submit=1", , result == null && !immediate_submit) + return button("Submit", "submit=1", null, result == null && !immediate_submit) /datum/async_input/proc/button(label, topic, on=FALSE, disabled=FALSE, id="") var/class = "" @@ -113,8 +113,8 @@ for(var/i = 1, i <= choices.len, i++) var/choice = choices[i] dat += "" - dat += "[button("+", i != 1 ? "upvote=[i]" : "", , i == 1)]" - dat += "[button("-", i != choices.len ? "downvote=[i]" : "", , i == choices.len)]" + dat += "[button("+", i != 1 ? "upvote=[i]" : "", null, i == 1)]" + dat += "[button("-", i != choices.len ? "downvote=[i]" : "", null, i == choices.len)]" dat += "[i]. [choice]" dat += "" dat += "" @@ -174,7 +174,7 @@ return dat /datum/async_input/autocomplete/render_buttons() - var/dat = button("Submit", "", , result == null && !immediate_submit, "submit-button") + var/dat = button("Submit", "", null, result == null && !immediate_submit, "submit-button") dat += button("Cancel", "close=1") return dat diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 4d6999f272d..8cf86712c07 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -1028,7 +1028,7 @@ GLOBAL_LIST_INIT(view_runtimes_verbs, list( if(!check_rights(R_ADMIN)) return - var/alert_type = alert(src, "Do you wish to send an admin alert to [key_name(about_to_be_banned, FALSE)]?",,"Yes", "No", "Custom Message") + var/alert_type = alert(src, "Do you wish to send an admin alert to [key_name(about_to_be_banned, FALSE)]?", null,"Yes", "No", "Custom Message") switch(alert_type) if("Yes") diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 30936910d8c..d64212e4fec 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -725,7 +725,7 @@ //Banning comes first if(notbannedlist.len) //at least 1 unbanned job exists in joblist so we have stuff to ban. - switch(alert("Temporary Ban of [M.ckey]?",,"Yes","No", "Cancel")) + switch(alert("Temporary Ban of [M.ckey]?", null,"Yes","No", "Cancel")) if("Yes") var/mins = input(usr,"How long (in minutes)?","Ban time",1440) as num|null if(!mins) @@ -788,7 +788,7 @@ if(C == null) to_chat(usr, "Mob has no client to kick.") return - if(alert("Kick [C.ckey]?",,"Yes","No") == "Yes") + if(alert("Kick [C.ckey]?", null,"Yes","No") == "Yes") if(C && C.holder && (C.holder.rights & R_BAN)) to_chat(usr, "[key_name_admin(C)] cannot be kicked from the server.") return @@ -833,7 +833,7 @@ var/target_ckey = href_list["webtools"] if(GLOB.configuration.url.forum_playerinfo_url) var/url_to_open = "[GLOB.configuration.url.forum_playerinfo_url][target_ckey]" - if(alert("Open [url_to_open]",,"Yes","No")=="Yes") + if(alert("Open [url_to_open]", null,"Yes","No")=="Yes") usr.client << link(url_to_open) else if(href_list["shownoteckey"]) @@ -869,7 +869,7 @@ return var/ban_ckey_param = href_list["dbbanaddckey"] - switch(alert("Temporary Ban of [M.ckey] / [ban_ckey_param]?",,"Yes","No", "Cancel")) + switch(alert("Temporary Ban of [M.ckey] / [ban_ckey_param]?", null,"Yes","No", "Cancel")) if("Yes") var/mins = input(usr,"How long (in minutes)?","Ban time",1440) as num|null if(!mins) @@ -1035,7 +1035,7 @@ if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return - if(alert(usr, "Confirm make monkey?",, "Yes", "No") != "Yes") + if(alert(usr, "Confirm make monkey?", null, "Yes", "No") != "Yes") return log_admin("[key_name(usr)] attempting to monkeyize [key_name(H)]") @@ -1051,7 +1051,7 @@ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return - if(alert(usr, "Confirm make corgi?",, "Yes", "No") != "Yes") + if(alert(usr, "Confirm make corgi?", null, "Yes", "No") != "Yes") return log_admin("[key_name(usr)] attempting to corgize [key_name(H)]") @@ -1065,7 +1065,7 @@ if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return - if(alert(usr, "Confirm make pai?",, "Yes", "No") != "Yes") + if(alert(usr, "Confirm make pai?", null, "Yes", "No") != "Yes") return var/painame = "Default" @@ -1476,7 +1476,7 @@ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return - if(alert(usr, "Confirm make ai?",, "Yes", "No") != "Yes") + if(alert(usr, "Confirm make ai?", null, "Yes", "No") != "Yes") return message_admins("Admin [key_name_admin(usr)] AIized [key_name_admin(H)]!", 1) @@ -1491,7 +1491,7 @@ if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return - if(alert(usr, "Confirm make alien?",, "Yes", "No") != "Yes") + if(alert(usr, "Confirm make alien?", null, "Yes", "No") != "Yes") return usr.client.cmd_admin_alienize(H) @@ -1503,7 +1503,7 @@ if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return - if(alert(usr, "Confirm make slime?",, "Yes", "No") != "Yes") + if(alert(usr, "Confirm make slime?", null, "Yes", "No") != "Yes") return usr.client.cmd_admin_slimeize(H) @@ -1516,7 +1516,7 @@ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return - if(alert(usr, "Confirm make superhero?",, "Yes", "No") != "Yes") + if(alert(usr, "Confirm make superhero?", null, "Yes", "No") != "Yes") return usr.client.cmd_admin_super(H) @@ -1528,7 +1528,7 @@ if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return - if(alert(usr, "Confirm make robot?",, "Yes", "No") != "Yes") + if(alert(usr, "Confirm make robot?", null, "Yes", "No") != "Yes") return usr.client.cmd_admin_robotize(H) @@ -1540,7 +1540,7 @@ if(isnewplayer(M)) to_chat(usr, "This cannot be used on instances of type /mob/new_player") return - if(alert(usr, "Confirm make animal?",, "Yes", "No") != "Yes") + if(alert(usr, "Confirm make animal?", null, "Yes", "No") != "Yes") return usr.client.cmd_admin_animalize(M) @@ -1885,7 +1885,7 @@ var/eviltype = input(src.owner, "Which type of evil fax do you wish to send [H]?","Its good to be baaaad...", "") as null|anything in etypes if(!(eviltype in etypes)) return - var/customname = clean_input("Pick a title for the evil fax.", "Fax Title", , owner) + var/customname = clean_input("Pick a title for the evil fax.", "Fax Title", null, owner) if(!customname) customname = "paper" var/obj/item/paper/evilfax/P = new /obj/item/paper/evilfax(null) @@ -1895,7 +1895,7 @@ P.info = "You really should've known better." P.myeffect = eviltype P.mytarget = H - if(alert("Do you want the Evil Fax to activate automatically if [H] tries to ignore it?",,"Yes", "No") == "Yes") + if(alert("Do you want the Evil Fax to activate automatically if [H] tries to ignore it?", null,"Yes", "No") == "Yes") P.activate_on_timeout = TRUE P.x = rand(-2, 0) P.y = rand(-1, 2) @@ -2419,7 +2419,7 @@ if(sender) message_admins("[key_name_admin(owner)] has started replying to a fax message from [key_name_admin(sender)]") - var/use_letterheard = alert("Use letterhead? If so, do not add your own header or a footer. Type and format only your actual message.",,"Nanotrasen","Syndicate", "No") + var/use_letterheard = alert("Use letterhead? If so, do not add your own header or a footer. Type and format only your actual message.", null,"Nanotrasen","Syndicate", "No") switch(use_letterheard) if("Nanotrasen") P = new /obj/item/paper/central_command(null) @@ -2445,7 +2445,7 @@ return input = admin_pencode_to_html(html_encode(input)) // Encode everything from pencode to html - var/customname = clean_input("Pick a title for the fax.", "Fax Title", , owner) + var/customname = clean_input("Pick a title for the fax.", "Fax Title", null, owner) if(!customname) customname = "paper" @@ -2478,14 +2478,14 @@ if("clown") stampvalue = "clown" else if(stamptype == "text") - stampvalue = clean_input("What should the stamp say?", "Stamp Text", , owner) + stampvalue = clean_input("What should the stamp say?", "Stamp Text", null, owner) else if(stamptype == "none") stamptype = "" else qdel(P) return - sendername = clean_input("What organization does the fax come from? This determines the prefix of the paper (i.e. Central Command- Title). This is optional.", "Organization", , owner) + sendername = clean_input("What organization does the fax come from? This determines the prefix of the paper (i.e. Central Command- Title). This is optional.", "Organization", null, owner) if(sender) notify = alert(src.owner, "Would you like to inform the original sender that a fax has arrived?","Notify Sender","Yes","No") @@ -3106,7 +3106,7 @@ if("guns") SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Summon Guns") var/survivor_probability = 0 - switch(alert("Do you want this to create survivors antagonists?", , "No Antags", "Some Antags", "All Antags!")) + switch(alert("Do you want this to create survivors antagonists?", null, "No Antags", "Some Antags", "All Antags!")) if("Some Antags") survivor_probability = 25 if("All Antags!") @@ -3116,7 +3116,7 @@ if("magic") SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Summon Magic") var/survivor_probability = 0 - switch(alert("Do you want this to create survivors antagonists?", , "No Antags", "Some Antags", "All Antags!")) + switch(alert("Do you want this to create survivors antagonists?", null, "No Antags", "Some Antags", "All Antags!")) if("Some Antags") survivor_probability = 25 if("All Antags!") diff --git a/code/modules/admin/verbs/admin_dice.dm b/code/modules/admin/verbs/admin_dice.dm index 58bac2e113a..7f5222d15ea 100644 --- a/code/modules/admin/verbs/admin_dice.dm +++ b/code/modules/admin/verbs/admin_dice.dm @@ -11,12 +11,12 @@ var/dice = num2text(sum) + "d" + num2text(side) - if(alert("Do you want to inform the world about your game?",,"Yes", "No") == "Yes") + if(alert("Do you want to inform the world about your game?", null,"Yes", "No") == "Yes") to_chat(world, "

The dice have been rolled by Gods!

") var/result = roll(dice) - if(alert("Do you want to inform the world about the result?",,"Yes", "No") == "Yes") + if(alert("Do you want to inform the world about the result?", null,"Yes", "No") == "Yes") to_chat(world, "

Gods rolled [dice], result is [result]

") message_admins("[key_name_admin(src)] rolled dice [dice], result is [result]", 1) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 58e73dd5866..a6abcf6e0d1 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -89,7 +89,7 @@ //get message text, limit it's length.and clean/escape html if(!msg) set_typing(C, TRUE) - msg = clean_input("Message:", "Private message to [holder ? key_name(C, FALSE) : key_name_hidden(C, FALSE)]", , src) + msg = clean_input("Message:", "Private message to [holder ? key_name(C, FALSE) : key_name_hidden(C, FALSE)]", null, src) set_typing(C, FALSE) if(!msg) @@ -227,7 +227,7 @@ // We only allow PMs once every 10 seconds, othewrise the channel can get spammed very quickly last_discord_pm_time = world.time + 10 SECONDS - var/msg = clean_input("Message:", "Private message to admins on Discord / 400 character limit", , src) + var/msg = clean_input("Message:", "Private message to admins on Discord / 400 character limit", null, src) if(!msg) return diff --git a/code/modules/admin/verbs/deathsquad.dm b/code/modules/admin/verbs/deathsquad.dm index 5ce36ff5ae7..463a557d1b0 100644 --- a/code/modules/admin/verbs/deathsquad.dm +++ b/code/modules/admin/verbs/deathsquad.dm @@ -10,10 +10,10 @@ GLOBAL_VAR_INIT(deathsquad_sent, FALSE) to_chat(usr, "The round hasn't started yet!") return if(GLOB.deathsquad_sent) - if(alert("A Deathsquad is already being sent, are you sure you want to send another?",, "Yes", "No") != "Yes") + if(alert("A Deathsquad is already being sent, are you sure you want to send another?", null, "Yes", "No") != "Yes") return else - if(alert("Do you want to send in the Deathsquad? Once enabled, this is irreversible.",, "Yes", "No") != "Yes") + if(alert("Do you want to send in the Deathsquad? Once enabled, this is irreversible.", null, "Yes", "No") != "Yes") return message_admins("[key_name_admin(proccaller)] has started to spawn a DeathSquad.") log_admin("[key_name_admin(proccaller)] has started to spawn a DeathSquad.") @@ -21,7 +21,7 @@ GLOBAL_VAR_INIT(deathsquad_sent, FALSE) var/mission = sanitize(copytext_char(input(src, "Please specify which mission the Deathsquad shall undertake.", "Specify Mission", "",), 1, MAX_MESSAGE_LEN)) if(!mission) - if(alert("Error, no mission set. Do you want to exit the setup process?",, "Yes", "No") == "Yes") + if(alert("Error, no mission set. Do you want to exit the setup process?", null, "Yes", "No") == "Yes") message_admins("[key_name_admin(proccaller)] cancelled their Deathsquad.") log_admin("[key_name(proccaller)] cancelled their Deathsquad.") return @@ -42,7 +42,7 @@ GLOBAL_VAR_INIT(deathsquad_sent, FALSE) var/is_leader = TRUE if(GLOB.deathsquad_sent) - if(alert("A Deathsquad leader has previously been sent with an unrestricted NAD, would you like to spawn another unrestricted NAD?",, "Yes", "No") != "Yes") + if(alert("A Deathsquad leader has previously been sent with an unrestricted NAD, would you like to spawn another unrestricted NAD?", null, "Yes", "No") != "Yes") is_leader = FALSE GLOB.deathsquad_sent = TRUE message_admins("[key_name_admin(proccaller)] has sent a Deathsquad with [commando_number] commandos.") @@ -63,17 +63,17 @@ GLOBAL_VAR_INIT(deathsquad_sent, FALSE) new_nuke = TRUE nuke_code = rand(10000, 99999) - if(alert("Do you want a new nuclear warhead to be spawned with this team?",, "Yes", "No") == "Yes") + if(alert("Do you want a new nuclear warhead to be spawned with this team?", null, "Yes", "No") == "Yes") new_nuke = TRUE // Find ghosts willing to be Deathsquad var/list/commando_ghosts = list() - if(alert("Would you like to custom pick your Deathsquad?",, "Yes", "No") == "Yes") + if(alert("Would you like to custom pick your Deathsquad?", null, "Yes", "No") == "Yes") var/image/source = image('icons/obj/cardboard_cutout.dmi', "cutout_deathsquad") - commando_ghosts = pollCandidatesWithVeto(src, usr, commando_number, "Join the DeathSquad?",, 21, 60 SECONDS, TRUE, GLOB.role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE, source = source) + commando_ghosts = pollCandidatesWithVeto(src, usr, commando_number, "Join the DeathSquad?", null, 21, 60 SECONDS, TRUE, GLOB.role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE, source = source) else var/image/source = image('icons/obj/cardboard_cutout.dmi', "cutout_deathsquad") - commando_ghosts = SSghost_spawns.poll_candidates("Join the Deathsquad?",, GLOB.responseteam_age, 60 SECONDS, TRUE, GLOB.role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE, source = source) + commando_ghosts = SSghost_spawns.poll_candidates("Join the Deathsquad?", null, GLOB.responseteam_age, 60 SECONDS, TRUE, GLOB.role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE, source = source) if(length(commando_ghosts) > commando_number) commando_ghosts.Cut(commando_number + 1) //cuts the ghost candidates down to the amount requested if(!length(commando_ghosts)) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index c6a28ab294e..c824a9ca400 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -20,7 +20,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that var/returnval = null var/class = null - switch(alert("Proc owned by something?",,"Yes","No")) + switch(alert("Proc owned by something?", null,"Yes","No")) if("Yes") targetselected = 1 if(src.holder && src.holder.marked_datum) @@ -487,7 +487,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) return if(M.ckey) - if(alert("This mob is being controlled by [M.ckey]. Are you sure you wish to assume control of it? [M.ckey] will be made a ghost.",,"Yes","No") != "Yes") + if(alert("This mob is being controlled by [M.ckey]. Are you sure you wish to assume control of it? [M.ckey] will be made a ghost.", null,"Yes","No") != "Yes") return else var/mob/dead/observer/ghost = new/mob/dead/observer(M,1) @@ -708,7 +708,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) if(!check_rights(R_DEBUG)) return - if(alert("Are you sure? This will start up the engine. Should only be used during debug!",,"Yes","No") != "Yes") + if(alert("Are you sure? This will start up the engine. Should only be used during debug!", null,"Yes","No") != "Yes") return for(var/obj/machinery/power/emitter/E in GLOB.machines) diff --git a/code/modules/admin/verbs/gimmick_team.dm b/code/modules/admin/verbs/gimmick_team.dm index 575866d8d53..7210606ba31 100644 --- a/code/modules/admin/verbs/gimmick_team.dm +++ b/code/modules/admin/verbs/gimmick_team.dm @@ -10,11 +10,11 @@ if(!SSticker) alert("The game hasn't started yet!") return - if(alert("Do you want to spawn a Gimmick Team at YOUR CURRENT LOCATION?",,"Yes","No")=="No") + if(alert("Do you want to spawn a Gimmick Team at YOUR CURRENT LOCATION?", null,"Yes","No")=="No") return var/turf/T = get_turf(mob) var/pick_manually = 0 - if(alert("Pick the team members manually? If you select yes, you pick from ghosts. If you select no, ghosts get offered the chance to join.",,"Yes","No")=="Yes") + if(alert("Pick the team members manually? If you select yes, you pick from ghosts. If you select no, ghosts get offered the chance to join.", null,"Yes","No")=="Yes") pick_manually = 1 var/list/teamsizeoptions = list(1, 2, 3, 4, 5, 6, 7, 8, 9, 10) var/teamsize = input(src, "How many team members?") as null|anything in teamsizeoptions @@ -36,7 +36,7 @@ if(isnull(dresscode)) return var/is_syndicate = FALSE - if(alert("Do you want these characters automatically classified as antagonists?",,"Yes","No")=="Yes") + if(alert("Do you want these characters automatically classified as antagonists?", null,"Yes","No")=="Yes") is_syndicate = TRUE var/datum/outfit/O = outfit_list[dresscode] diff --git a/code/modules/admin/verbs/infiltratorteam_syndicate.dm b/code/modules/admin/verbs/infiltratorteam_syndicate.dm index 6f517384bfb..a8c21cda320 100644 --- a/code/modules/admin/verbs/infiltratorteam_syndicate.dm +++ b/code/modules/admin/verbs/infiltratorteam_syndicate.dm @@ -13,13 +13,13 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0) if(!SSticker) alert("The game hasn't started yet!") return - if(alert("Do you want to send in the Syndicate Infiltration Team?",,"Yes","No")=="No") + if(alert("Do you want to send in the Syndicate Infiltration Team?", null,"Yes","No")=="No") return var/spawn_dummies = 0 - if(alert("Spawn full-size team, even if there aren't enough ghosts to populate them?",,"Yes","No")=="Yes") + if(alert("Spawn full-size team, even if there aren't enough ghosts to populate them?", null,"Yes","No")=="Yes") spawn_dummies = 1 var/pick_manually = 0 - if(alert("Pick the team members manually? If you select yes, you pick from ghosts. If you select no, ghosts get offered the chance to join.",,"Yes","No")=="Yes") + if(alert("Pick the team members manually? If you select yes, you pick from ghosts. If you select no, ghosts get offered the chance to join.", null,"Yes","No")=="Yes") pick_manually = 1 var/list/teamsizeoptions = list(2,3,4,5,6) var/teamsize = input(src, "How many team members, including the team leader?") as null|anything in teamsizeoptions @@ -36,7 +36,7 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0) var/tcamount = text2num(tctext) tcamount = clamp(tcamount, 0, 1000) if(GLOB.sent_syndicate_infiltration_team == 1) - if(alert("A Syndicate Infiltration Team has already been sent. Sure you want to send another?",,"Yes","No")=="No") + if(alert("A Syndicate Infiltration Team has already been sent. Sure you want to send another?", null,"Yes","No")=="No") return var/syndicate_leader_selected = 0 diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm index af6d55cc44e..51b5cdae310 100644 --- a/code/modules/admin/verbs/modifyvariables.dm +++ b/code/modules/admin/verbs/modifyvariables.dm @@ -356,7 +356,7 @@ GLOBAL_PROTECT(VVmaint_only) L += var_value - switch(alert("Would you like to associate a value with the list entry?",,"Yes","No")) + switch(alert("Would you like to associate a value with the list entry?", null,"Yes","No")) if("Yes") L[var_value] = mod_list_add_ass(O) //hehe if(O) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index e22f03a8b23..beb312f2dc4 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -366,7 +366,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(G_found.mind && !G_found.mind.active) //mind isn't currently in use by someone/something //Check if they were an alien if(G_found.mind.assigned_role=="Alien") - if(alert("This character appears to have been an alien. Would you like to respawn them as such?",,"Yes","No")=="Yes") + if(alert("This character appears to have been an alien. Would you like to respawn them as such?", null,"Yes","No")=="Yes") var/turf/T if(GLOB.xeno_spawn.len) T = pick(GLOB.xeno_spawn) else T = pick(GLOB.latejoin) @@ -488,10 +488,10 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!issilicon(new_character))//If they are not a cyborg/AI. if(!record_found && new_character.mind.assigned_role != new_character.mind.special_role)//If there are no records for them. If they have a record, this info is already in there. Offstation special characters announced anyway. //Power to the user! - if(alert(new_character,"Warning: No data core entry detected. Would you like to announce the arrival of this character by adding them to various databases, such as medical records?",,"No","Yes")=="Yes") + if(alert(new_character,"Warning: No data core entry detected. Would you like to announce the arrival of this character by adding them to various databases, such as medical records?", null,"No","Yes")=="Yes") GLOB.data_core.manifest_inject(new_character) - if(alert(new_character,"Would you like an active AI to announce this character?",,"No","Yes")=="Yes") + if(alert(new_character,"Would you like an active AI to announce this character?", null,"No","Yes")=="Yes") call(TYPE_PROC_REF(/mob/new_player, AnnounceArrival))(new_character, new_character.mind.assigned_role) message_admins("[key_name_admin(usr)] has respawned [key_name_admin(G_found)] as [new_character.real_name].", 1) @@ -631,7 +631,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!message) return - switch(alert("Should this be announced to the general population?",,"Yes","No", "Cancel")) + switch(alert("Should this be announced to the general population?", null,"Yes","No", "Cancel")) if("Yes") var/beepsound = input(usr, "What sound should the announcement make?", "Announcement Sound", "") as anything in MsgSound diff --git a/code/modules/admin/verbs/space_transitions.dm b/code/modules/admin/verbs/space_transitions.dm index 86f7aa95d43..a2d43cd17f5 100644 --- a/code/modules/admin/verbs/space_transitions.dm +++ b/code/modules/admin/verbs/space_transitions.dm @@ -6,7 +6,7 @@ if(!check_rights(R_ADMIN|R_DEBUG)) return - var/choice = alert("Do you want to rebuild space transitions?",,"Yes", "No") + var/choice = alert("Do you want to rebuild space transitions?", null,"Yes", "No") if(choice == "No") return @@ -29,7 +29,7 @@ if(!check_rights(R_ADMIN|R_DEBUG)) return - var/choice = alert("Are you sure you want to make a space map out of turfs?",,"Yes","No") + var/choice = alert("Are you sure you want to make a space map out of turfs?", null,"Yes","No") if(choice == "No") return diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm index 31978d69dab..77bda17e014 100644 --- a/code/modules/admin/verbs/striketeam_syndicate.dm +++ b/code/modules/admin/verbs/striketeam_syndicate.dm @@ -15,7 +15,7 @@ GLOBAL_VAR_INIT(sent_syndicate_strike_team, 0) if(GLOB.sent_syndicate_strike_team == 1) alert("The Syndicate are already sending a team, Mr. Dumbass.") return - if(alert("Do you want to send in the Syndicate Strike Team? Once enabled, this is irreversible.",,"Yes","No")=="No") + if(alert("Do you want to send in the Syndicate Strike Team? Once enabled, this is irreversible.", null,"Yes","No")=="No") return alert("This 'mode' will go on until everyone is dead or the station is destroyed. You may also admin-call the evac shuttle when appropriate. Spawned syndicates have internals cameras which are viewable through a monitor inside the Syndicate Mothership Bridge. Assigning the team's detailed task is recommended from there. The first one selected/spawned will be the team leader.") @@ -25,7 +25,7 @@ GLOBAL_VAR_INIT(sent_syndicate_strike_team, 0) while(!input) input = sanitize(copytext_char(input(src, "Please specify which mission the syndicate strike team shall undertake.", "Specify Mission", ""),1,MAX_MESSAGE_LEN)) if(!input) - if(alert("Error, no mission set. Do you want to exit the setup process?",,"Yes","No")=="Yes") + if(alert("Error, no mission set. Do you want to exit the setup process?", null,"Yes","No")=="Yes") return if(GLOB.sent_syndicate_strike_team) @@ -46,7 +46,7 @@ GLOBAL_VAR_INIT(sent_syndicate_strike_team, 0) // Find ghosts willing to be SST var/image/I = new('icons/obj/cardboard_cutout.dmi', "cutout_commando") - var/list/commando_ghosts = pollCandidatesWithVeto(src, usr, SYNDICATE_COMMANDOS_POSSIBLE, "Join the Syndicate Strike Team?",, 21, 60 SECONDS, TRUE, GLOB.role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE, source = I) + var/list/commando_ghosts = pollCandidatesWithVeto(src, usr, SYNDICATE_COMMANDOS_POSSIBLE, "Join the Syndicate Strike Team?", null, 21, 60 SECONDS, TRUE, GLOB.role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE, source = I) if(!length(commando_ghosts)) to_chat(usr, "Nobody volunteered to join the SST.") return diff --git a/code/modules/atmospherics/machinery/atmospherics.dm b/code/modules/atmospherics/machinery/atmospherics.dm index 6bae3e8d723..e904ecf8683 100644 --- a/code/modules/atmospherics/machinery/atmospherics.dm +++ b/code/modules/atmospherics/machinery/atmospherics.dm @@ -359,21 +359,21 @@ Pipelines + Other Objects -> Pipe network if(node) var/node_dir = get_dir(src,node) if(node.icon_connect_type == "-supply") - add_underlay_adapter(T, , node_dir, "") + add_underlay_adapter(T, null, node_dir, "") add_underlay_adapter(T, node, node_dir, "-supply") - add_underlay_adapter(T, , node_dir, "-scrubbers") + add_underlay_adapter(T, null, node_dir, "-scrubbers") else if(node.icon_connect_type == "-scrubbers") - add_underlay_adapter(T, , node_dir, "") - add_underlay_adapter(T, , node_dir, "-supply") + add_underlay_adapter(T, null, node_dir, "") + add_underlay_adapter(T, null, node_dir, "-supply") add_underlay_adapter(T, node, node_dir, "-scrubbers") else add_underlay_adapter(T, node, node_dir, "") - add_underlay_adapter(T, , node_dir, "-supply") - add_underlay_adapter(T, , node_dir, "-scrubbers") + add_underlay_adapter(T, null, node_dir, "-supply") + add_underlay_adapter(T, null, node_dir, "-scrubbers") else - add_underlay_adapter(T, , direction, "-supply") - add_underlay_adapter(T, , direction, "-scrubbers") - add_underlay_adapter(T, , direction, "") + add_underlay_adapter(T, null, direction, "-supply") + add_underlay_adapter(T, null, direction, "-scrubbers") + add_underlay_adapter(T, null, direction, "") /obj/machinery/atmospherics/proc/add_underlay_adapter(turf/T, obj/machinery/atmospherics/node, direction, icon_connect_type) //modified from add_underlay, does not make exposed underlays if(node) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm index 56ad9262ef2..cfa4bc99f71 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -101,7 +101,7 @@ if(node) add_underlay(T, node, dir, node.icon_connect_type) else - add_underlay(T,, dir) + add_underlay(T, null, dir) var/icon/frame = icon('icons/atmos/vent_pump.dmi', "frame") underlays += frame diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index fe3372bf665..7a61e3e142d 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -90,7 +90,7 @@ if(node) add_underlay(T, node, dir, node.icon_connect_type) else - add_underlay(T,, dir) + add_underlay(T, null, dir) var/icon/frame = icon('icons/atmos/vent_scrubber.dmi', "frame") underlays += frame diff --git a/code/modules/atmospherics/machinery/pipes/cap.dm b/code/modules/atmospherics/machinery/pipes/cap.dm index 402dc4e89cd..d3a7c706421 100644 --- a/code/modules/atmospherics/machinery/pipes/cap.dm +++ b/code/modules/atmospherics/machinery/pipes/cap.dm @@ -60,7 +60,7 @@ /obj/machinery/atmospherics/pipe/cap/update_overlays() . = ..() alpha = 255 - . += SSair.icon_manager.get_atmos_icon("pipe", , pipe_color, "cap" + icon_connect_type) + . += SSair.icon_manager.get_atmos_icon("pipe", null, pipe_color, "cap" + icon_connect_type) /obj/machinery/atmospherics/pipe/cap/atmos_init() ..() diff --git a/code/modules/atmospherics/machinery/pipes/manifold.dm b/code/modules/atmospherics/machinery/pipes/manifold.dm index 33f01ba485a..46f9f70323c 100644 --- a/code/modules/atmospherics/machinery/pipes/manifold.dm +++ b/code/modules/atmospherics/machinery/pipes/manifold.dm @@ -122,8 +122,8 @@ /obj/machinery/atmospherics/pipe/manifold/update_overlays() . = ..() alpha = 255 - . += SSair.icon_manager.get_atmos_icon("manifold", , pipe_color, "core" + icon_connect_type) - . += SSair.icon_manager.get_atmos_icon("manifold", , , "clamps" + icon_connect_type) + . += SSair.icon_manager.get_atmos_icon("manifold", null, pipe_color, "core" + icon_connect_type) + . += SSair.icon_manager.get_atmos_icon("manifold", null, null, "clamps" + icon_connect_type) update_underlays() /obj/machinery/atmospherics/pipe/manifold/update_underlays() @@ -143,7 +143,7 @@ directions -= add_underlay(T,node3,node3_direction,icon_connect_type) for(var/D in directions) - add_underlay(T,,D,icon_connect_type) + add_underlay(T, null,D,icon_connect_type) // A check to make sure both nodes exist - self-delete if they aren't present /obj/machinery/atmospherics/pipe/manifold/check_nodes_exist() diff --git a/code/modules/atmospherics/machinery/pipes/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/manifold4w.dm index 560a08a7760..3d547129f5f 100644 --- a/code/modules/atmospherics/machinery/pipes/manifold4w.dm +++ b/code/modules/atmospherics/machinery/pipes/manifold4w.dm @@ -95,8 +95,8 @@ /obj/machinery/atmospherics/pipe/manifold4w/update_overlays() . = ..() alpha = 255 - . += SSair.icon_manager.get_atmos_icon("manifold", , pipe_color, "4way" + icon_connect_type) - . += SSair.icon_manager.get_atmos_icon("manifold", , , "clamps_4way" + icon_connect_type) + . += SSair.icon_manager.get_atmos_icon("manifold", null, pipe_color, "4way" + icon_connect_type) + . += SSair.icon_manager.get_atmos_icon("manifold", null, null, "clamps_4way" + icon_connect_type) update_underlays() /obj/machinery/atmospherics/pipe/manifold4w/update_underlays() @@ -118,7 +118,7 @@ directions -= add_underlay(T,node4,node4_direction,icon_connect_type) for(var/D in directions) - add_underlay(T,,D,icon_connect_type) + add_underlay(T, null,D,icon_connect_type) // A check to make sure both nodes exist - self-delete if they aren't present /obj/machinery/atmospherics/pipe/manifold4w/check_nodes_exist() diff --git a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm index fd63c21119f..477ccab1455 100644 --- a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm +++ b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm @@ -122,9 +122,9 @@ . = ..() alpha = 255 if(node1 && node2) - . += SSair.icon_manager.get_atmos_icon("pipe", , pipe_color, pipe_icon + "intact" + icon_connect_type) + . += SSair.icon_manager.get_atmos_icon("pipe", null, pipe_color, pipe_icon + "intact" + icon_connect_type) else - . += SSair.icon_manager.get_atmos_icon("pipe", , pipe_color, pipe_icon + "exposed[node1?1:0][node2?1:0]" + icon_connect_type) + . += SSair.icon_manager.get_atmos_icon("pipe", null, pipe_color, pipe_icon + "exposed[node1?1:0][node2?1:0]" + icon_connect_type) // A check to make sure both nodes exist - self-delete if they aren't present /obj/machinery/atmospherics/pipe/simple/check_nodes_exist() diff --git a/code/modules/buildmode/submodes/save.dm b/code/modules/buildmode/submodes/save.dm index 34a57e1f7e4..a4be338e9d0 100644 --- a/code/modules/buildmode/submodes/save.dm +++ b/code/modules/buildmode/submodes/save.dm @@ -10,7 +10,7 @@ to_chat(user, "***********************************************************") /datum/buildmode_mode/save/change_settings(mob/user) - use_json = (alert("Would you like to use json (Default is \"Yes\")?",,"Yes","No") == "Yes") + use_json = (alert("Would you like to use json (Default is \"Yes\")?", null,"Yes","No") == "Yes") /datum/buildmode_mode/save/handle_selected_region(mob/user, params) var/list/pa = params2list(params) diff --git a/code/modules/client/preference/link_processing.dm b/code/modules/client/preference/link_processing.dm index 01a8dacd8fc..41aa9f771ae 100644 --- a/code/modules/client/preference/link_processing.dm +++ b/code/modules/client/preference/link_processing.dm @@ -191,7 +191,7 @@ if("input") switch(href_list["preference"]) if("name") - var/raw_name = clean_input("Choose your character's name:", "Character Preference", , user) + var/raw_name = clean_input("Choose your character's name:", "Character Preference", null, user) if(!isnull(raw_name)) // Check to ensure that the user entered text (rather than cancel.) var/new_name = reject_bad_name(raw_name, 1) if(new_name) diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index fb8aafdbdde..42583e0b6c4 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -12,7 +12,7 @@ if(turfs.len) //Pick a turf to spawn at if we can var/turf/T = pick(turfs) - var/obj/structure/spacevine_controller/SC = new /obj/structure/spacevine_controller(T, , rand(30,70),rand(5,2)) //spawn a controller at turf + var/obj/structure/spacevine_controller/SC = new /obj/structure/spacevine_controller(T, null, rand(30,70),rand(5,2)) //spawn a controller at turf // Make the event start fun - give the vine a random hostile mutation if(SC.vines.len) @@ -534,7 +534,7 @@ /obj/structure/spacevine_controller/New(loc, list/muts, potency, production) color = "#ffffff" - spawn_spacevine_piece(loc, , muts) + spawn_spacevine_piece(loc, null, muts) START_PROCESSING(SSobj, src) init_subtypes(/datum/spacevine_mutation/, mutations_list) if(potency != null && potency > 0) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 1ec33fa2fc0..d29f82eac76 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -21,7 +21,7 @@ if(client) stop_sound_channel(CHANNEL_LOBBYMUSIC) - var/mob/living/silicon/ai/O = new (loc,,,1)//No MMI but safety is in effect. + var/mob/living/silicon/ai/O = new (loc, null, null,1)//No MMI but safety is in effect. O.invisibility = 0 O.aiRestorePowerRoutine = 0 diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 353f9a2d7cb..366122a9073 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -82,7 +82,7 @@ else data = "[header]
[infolinks ? info_links : info]
[footer][stamps]" if(view) - var/datum/browser/popup = new(user, "Paper[UID()]", , paper_width, paper_height) + var/datum/browser/popup = new(user, "Paper[UID()]", null, paper_width, paper_height) popup.include_default_stylesheet = FALSE popup.set_content(data) if(!stars) diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index c7339cb1585..649d994f32c 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -72,7 +72,7 @@ P = papers[papers.len] papers.Remove(P) else - if(letterhead_type && alert("Choose a style",,"Letterhead","Blank")=="Letterhead") + if(letterhead_type && alert("Choose a style", null,"Letterhead","Blank")=="Letterhead") P = new letterhead_type else P = new /obj/item/paper diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm index 9aa3426a256..b1bf75e3c95 100644 --- a/code/modules/response_team/ert.dm +++ b/code/modules/response_team/ert.dm @@ -63,7 +63,7 @@ GLOBAL_LIST_EMPTY(ert_request_messages) GLOB.active_team.cyborg_security_permitted = cyborg_security GLOB.send_emergency_team = TRUE - var/list/ert_candidates = shuffle(SSghost_spawns.poll_candidates("Join the Emergency Response Team?",, GLOB.responseteam_age, 45 SECONDS, TRUE, GLOB.role_playtime_requirements[ROLE_ERT])) + var/list/ert_candidates = shuffle(SSghost_spawns.poll_candidates("Join the Emergency Response Team?", null, GLOB.responseteam_age, 45 SECONDS, TRUE, GLOB.role_playtime_requirements[ROLE_ERT])) if(!length(ert_candidates)) GLOB.active_team.cannot_send_team() GLOB.send_emergency_team = FALSE diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 79fef2d6b81..06d8c2abf33 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -369,7 +369,7 @@ var/obj/docking_port/stationary/S0 = get_docked() var/obj/docking_port/stationary/S1 = findTransitDock() if(S1) - if(dock(S1, , TRUE)) + if(dock(S1, null, TRUE)) WARNING("shuttle \"[id]\" could not enter transit space. Docked at [S0 ? S0.id : "null"]. Transit dock [S1 ? S1.id : "null"].") else previous = S0