From 0cdc45eddf54a3223388b4df7db2ddfca1aed31b Mon Sep 17 00:00:00 2001 From: Seris02 Date: Thu, 9 Mar 2023 17:19:02 +0800 Subject: [PATCH] merge conflict fixes for chat filters PR --- code/game/jobs/job_controller.dm | 5 -- code/game/machinery/telecomms/broadcaster.dm | 36 ++------- code/modules/client/verbs/advanced_who.dm | 5 -- code/modules/client/verbs/who.dm | 4 - .../food/kitchen/cooking_machines/_cooker.dm | 7 +- .../food/kitchen/cooking_machines/_mixer.dm | 13 +--- .../food/kitchen/cooking_machines/grill.dm | 78 ------------------- code/modules/hydroponics/grown.dm | 40 ++-------- code/modules/hydroponics/seed_machines.dm | 55 +------------ code/modules/hydroponics/trays/tray_tools.dm | 14 ---- code/modules/mob/dead/observer/observer.dm | 6 +- code/modules/mob/dead/observer/observer_vr.dm | 8 +- code/modules/mob/hear_say.dm | 49 +----------- .../mob/living/carbon/human/emote_vr.dm | 4 +- code/modules/mob/living/carbon/human/human.dm | 67 +++++----------- .../carbon/human/species/species_attack_vr.dm | 12 +-- .../human/species/species_shapeshift_vr.dm | 2 +- code/modules/mob/living/living.dm | 26 ++----- code/modules/mob/living/living_vr.dm | 2 +- code/modules/mob/living/riding.dm | 5 -- code/modules/mob/living/silicon/ai/ai.dm | 18 +---- code/modules/mob/living/silicon/pai/pai.dm | 18 +---- code/modules/mob/living/silicon/pai/pai_vr.dm | 20 ++--- .../silicon/robot/dogborg/dog_modules_vr.dm | 34 ++++---- .../silicon/robot/dogborg/dog_sleeper_vr.dm | 6 +- .../mob/living/silicon/robot/robot_items.dm | 10 +-- .../mob/living/silicon/robot/robot_vr.dm | 4 +- code/modules/mob/living/silicon/say.dm | 7 +- code/modules/mob/living/silicon/silicon.dm | 49 ------------ code/modules/mob/say_vr.dm | 4 +- code/modules/nifsoft/nif.dm | 2 +- code/modules/nifsoft/nifsoft.dm | 2 +- .../nifsoft/software/13_soulcatcher.dm | 16 ++-- code/modules/surgery/organs_internal.dm | 74 +----------------- code/modules/surgery/robotics.dm | 10 --- code/modules/vchat/js/vchat.min.js | 2 +- code/modules/vore/resizing/resize_vr.dm | 6 +- .../xenoarcheaology/artifacts/replicator.dm | 9 +-- .../artifacts/replicator_vr.dm | 8 +- code/modules/xenoarcheaology/effect.dm | 20 +---- 40 files changed, 128 insertions(+), 629 deletions(-) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 59941e12e4..2cea520fd2 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -538,13 +538,8 @@ var/global/datum/controller/occupations/job_master if(job.supervisors) to_chat(H, "As the [alt_title ? alt_title : rank] you answer directly to [job.supervisors]. Special circumstances may change this.") if(job.has_headset) -<<<<<<< HEAD H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_l_ear) - to_chat(H, "To speak on your department's radio channel use :h. For the use of other channels, examine your headset.") -======= - H.equip_to_slot_or_del(new /obj/item/radio/headset(H), slot_l_ear) to_chat(H, "To speak on your department's radio channel use :h. For the use of other channels, examine your headset.") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) if(job.req_admin_notify) to_chat(H, "You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp.") diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 7513153dc5..c07722523c 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -454,12 +454,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept var/part_b_extra = "" if(data == DATA_ANTAG) // intercepted radio message part_b_extra = " (Intercepted)" -<<<<<<< HEAD - var/part_a = "\icon[radio][bicon(radio)]\[[freq_text]\][part_b_extra] " // goes in the actual output -======= var/part_a = "" - var/part_b = "[bicon(radio)]\[[freq_text]\][part_b_extra] " // goes in the actual output ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + var/part_b = "\icon[radio][bicon(radio)]\[[freq_text]\][part_b_extra] " // goes in the actual output // --- Some more pre-message formatting --- var/part_c = " " // Tweaked for security headsets -- TLE @@ -516,58 +512,38 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept /* --- Process all the mobs that heard a masked voice (understood) --- */ if(length(heard_masked)) for (var/mob/R in heard_masked) -<<<<<<< HEAD - R.hear_radio(message_pieces, verbage, part_a, part_b, part_c, M, 0, name) + R.hear_radio(message_pieces, verbage, part_a, part_b, part_c, part_d, part_e, M, 0, name) if(R.is_preference_enabled(/datum/client_preference/radio_sounds)) R << 'sound/effects/radio_common_quieter.ogg' -======= - R.hear_radio(message_pieces, verbage, part_a, part_b, part_c, part_d, part_e, M, 0, name) ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) /* --- Process all the mobs that heard the voice normally (understood) --- */ if(length(heard_normal)) for (var/mob/R in heard_normal) -<<<<<<< HEAD - R.hear_radio(message_pieces, verbage, part_a, part_b, part_c, M, 0, realname) + R.hear_radio(message_pieces, verbage, part_a, part_b, part_c, part_d, part_e, M, 0, realname) if(R.is_preference_enabled(/datum/client_preference/radio_sounds)) R << 'sound/effects/radio_common_quieter.ogg' -======= - R.hear_radio(message_pieces, verbage, part_a, part_b, part_c, part_d, part_e, M, 0, realname) ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) /* --- Process all the mobs that heard the voice normally (did not understand) --- */ if(length(heard_voice)) for (var/mob/R in heard_voice) -<<<<<<< HEAD - R.hear_radio(message_pieces, verbage, part_a, part_b, part_c, M,0, vname) + R.hear_radio(message_pieces, verbage, part_a, part_b, part_c, part_d, part_e, M,0, vname) if(R.is_preference_enabled(/datum/client_preference/radio_sounds)) R << 'sound/effects/radio_common_quieter.ogg' -======= - R.hear_radio(message_pieces, verbage, part_a, part_b, part_c, part_d, part_e, M,0, vname) ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) /* --- Process all the mobs that heard a garbled voice (did not understand) --- */ // Displays garbled message (ie "f*c* **u, **i*er!") if(length(heard_garbled)) for (var/mob/R in heard_garbled) -<<<<<<< HEAD - R.hear_radio(message_pieces, verbage, part_a, part_b, part_c, M, 1, vname) + R.hear_radio(message_pieces, verbage, part_a, part_b, part_c, part_d, part_e, M, 1, vname) if(R.is_preference_enabled(/datum/client_preference/radio_sounds)) R << 'sound/effects/radio_common_quieter.ogg' -======= - R.hear_radio(message_pieces, verbage, part_a, part_b, part_c, part_d, part_e, M, 1, vname) ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) /* --- Complete gibberish. Usually happens when there's a compressed message --- */ if(length(heard_gibberish)) for (var/mob/R in heard_gibberish) -<<<<<<< HEAD - R.hear_radio(message_pieces, verbage, part_a, part_b, part_c, M, 1) + R.hear_radio(message_pieces, verbage, part_a, part_b, part_c, part_d, part_e, M, 1) if(R.is_preference_enabled(/datum/client_preference/radio_sounds)) R << 'sound/effects/radio_common_quieter.ogg' -======= - R.hear_radio(message_pieces, verbage, part_a, part_b, part_c, part_d, part_e, M, 1) ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) return 1 diff --git a/code/modules/client/verbs/advanced_who.dm b/code/modules/client/verbs/advanced_who.dm index 8f3363839a..14fe2c3a04 100644 --- a/code/modules/client/verbs/advanced_who.dm +++ b/code/modules/client/verbs/advanced_who.dm @@ -93,10 +93,5 @@ msg += "[line]" msg += "" msg += "Total Players: [length(Lines)]" -<<<<<<< HEAD - msg = "" + msg + "" - to_chat(src, msg) -======= msg = "" + msg + "" to_chat(src, msg) ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) diff --git a/code/modules/client/verbs/who.dm b/code/modules/client/verbs/who.dm index 3aec4165c0..f42c33681d 100644 --- a/code/modules/client/verbs/who.dm +++ b/code/modules/client/verbs/who.dm @@ -122,7 +122,6 @@ if(config.show_event_managers) msg += "\n Current Miscellaneous ([num_event_managers_online]):\n" + eventMmsg -<<<<<<< HEAD var/num_mentors_online = 0 var/mmsg = "" @@ -147,7 +146,4 @@ msg += "\nAdminhelps are also sent to Discord. If no admins are available in game try anyway and an admin on Discord may see it and respond." - to_chat(src, msg) -======= to_chat(src,"[jointext(msg, "
")]") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) diff --git a/code/modules/food/kitchen/cooking_machines/_cooker.dm b/code/modules/food/kitchen/cooking_machines/_cooker.dm index bbdb64c16f..e02d6dd477 100644 --- a/code/modules/food/kitchen/cooking_machines/_cooker.dm +++ b/code/modules/food/kitchen/cooking_machines/_cooker.dm @@ -61,7 +61,7 @@ var/obj/item/I = usr.get_active_hand() if(slot <= LAZYLEN(cooking_objs)) // Inserting var/datum/cooking_item/CI = cooking_objs[slot] - + if(istype(I) && can_insert(I)) // Why do hard work when we can just make them smack us? attackby(I, usr) else if(istype(CI)) @@ -198,11 +198,6 @@ /obj/machinery/appliance/cooker/add_content(var/obj/item/I, var/mob/user) var/datum/cooking_item/CI = ..() -<<<<<<< HEAD if(istype(CI) && CI.combine_target) - to_chat(user, "\The [I] will be used to make a [selected_option]. Output selection is returned to default for future items.") -======= - if (CI && CI.combine_target) to_chat(user, "\The [I] will be used to make a [selected_option]. Output selection is returned to default for future items.") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) selected_option = null \ No newline at end of file diff --git a/code/modules/food/kitchen/cooking_machines/_mixer.dm b/code/modules/food/kitchen/cooking_machines/_mixer.dm index 8a0987d698..f04f8bba46 100644 --- a/code/modules/food/kitchen/cooking_machines/_mixer.dm +++ b/code/modules/food/kitchen/cooking_machines/_mixer.dm @@ -25,12 +25,12 @@ fundamental differences cooking_objs += new /datum/cooking_item(new /obj/item/weapon/reagent_containers/cooking_container(src)) cooking = FALSE selected_option = pick(output_options) - + mixer_loop = new(list(src), FALSE) - + /obj/machinery/appliance/mixer/Destroy() . = ..() - + QDEL_NULL(mixer_loop) //Mixers cannot-not do combining mode. So the default option is removed from this. A combine target must be chosen @@ -119,13 +119,8 @@ fundamental differences stat |= POWEROFF use_power = 0 if(usr) -<<<<<<< HEAD - usr.visible_message("[usr] turns the [src] off", "You turn off \the [src].") - playsound(src, 'sound/machines/click.ogg', 40, 1) -======= usr.visible_message("[usr] turns the [src] off.", "You turn off \the [src].") - playsound(src, "button", 40, 1) ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + playsound(src, 'sound/machines/click.ogg', 40, 1) update_icon() /obj/machinery/appliance/mixer/can_insert(var/obj/item/I, var/mob/user) diff --git a/code/modules/food/kitchen/cooking_machines/grill.dm b/code/modules/food/kitchen/cooking_machines/grill.dm index 2a97259904..7bdfe526a3 100644 --- a/code/modules/food/kitchen/cooking_machines/grill.dm +++ b/code/modules/food/kitchen/cooking_machines/grill.dm @@ -24,13 +24,8 @@ resistance = 8 KILOWATTS // Very fast to heat up. max_contents = 3 // Arbitrary number, 3 grill 'racks' -<<<<<<< HEAD container_type = /obj/item/weapon/reagent_containers/cooking_container/grill - -======= - container_type = /obj/item/reagent_containers/cooking_container/grill ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) /obj/machinery/appliance/cooker/grill/Initialize() . = ..() grill_loop = new(list(src), FALSE) @@ -52,76 +47,3 @@ icon_state = off_icon if(grill_loop) grill_loop.stop(src) -<<<<<<< HEAD -======= - -/* // Test Comment this out too, /cooker does this for us, and this path '/obj/machinery/appliance/grill' is invalid anyways, meaning it does jack shit. - Updated the paths, but I'm basically commenting all this shit out and if the grill works as-normal, none of this stuff is needed. -/obj/machinery/appliance/grill/toggle_power() - set src in view() - set name = "Toggle Power" - set category = "Object" - - var/datum/cooking_item/CI = cooking_objs[1] - - if (stat & POWEROFF)//Its turned off - stat &= ~POWEROFF - if (usr) - usr.visible_message("[usr] turns \the [src] on.", "You turn on \the [src].") - get_cooking_work(CI) - use_power = 2 - else //It's on, turn it off - stat |= POWEROFF - use_power = 0 - if (usr) - usr.visible_message("[usr] turns \the [src] off.", "You turn off \the [src].") - playsound(src, 'sound/machines/click.ogg', 40, 1) - update_icon() - - -/obj/machinery/appliance/cooker/grill/Initialize() - . = ..() - // cooking_objs += new /datum/cooking_item(new /obj/item/reagent_containers/cooking_container(src)) - cooking = FALSE - -/obj/machinery/appliance/cooker/grill/has_space(var/obj/item/I) - var/datum/cooking_item/CI = cooking_objs[1] - if (!CI || !CI.container) - return 0 - - if (CI.container.can_fit(I)) - return CI - - return 0 -*/ -/* // Test comment this out, I don't think this is doing shit anyways. -//Container is not removable -/obj/machinery/appliance/grill/removal_menu(var/mob/user) - if (can_remove_items(user)) - var/list/menuoptions = list() - for (var/a in cooking_objs) - var/datum/cooking_item/CI = a - if (CI.container) - if (!CI.container.check_contents()) - to_chat(user, "There's nothing in the [src] you can remove!") - return - - for (var/obj/item/I in CI.container) - menuoptions[I.name] = I - - var/selection = input(user, "Which item would you like to remove? If you want to remove chemicals, use an empty beaker.", "Remove ingredients") as null|anything in menuoptions - if (selection) - var/obj/item/I = menuoptions[selection] - if (!user || !user.put_in_hands(I)) - I.forceMove(get_turf(src)) - update_icon() - return 1 - return 0 -*/ - -/* // Test remove this too. -/obj/machinery/appliance/grill/process() - if (!stat) - for (var/i in cooking_objs) - do_cooking_tick(i) -*/ ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 377252412f..a7f5181219 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -210,11 +210,7 @@ if(G.get_amount() >= G.max_amount) continue G.attackby(NG, user) -<<<<<<< HEAD - to_chat(user, "You add the newly-formed wood to the stack. It now contains [NG.get_amount()] planks.") -======= - to_chat(user, "You add the newly-formed wood to the stack. It now contains [NG.amount] planks.") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + to_chat(user, "You add the newly-formed wood to the stack. It now contains [NG.get_amount()] planks.") qdel(src) return @@ -225,46 +221,26 @@ return if(seed.kitchen_tag == "potato" || !isnull(seed.chems["potato"])) -<<<<<<< HEAD - to_chat(user, "You slice \the [src] into sticks.") - new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(get_turf(src)) -======= to_chat(user, "You slice \the [src] into sticks.") - new /obj/item/reagent_containers/food/snacks/rawsticks(get_turf(src)) ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(get_turf(src)) qdel(src) return if(!isnull(seed.chems["carrotjuice"])) -<<<<<<< HEAD - to_chat(user, "You slice \the [src] into sticks.") - new /obj/item/weapon/reagent_containers/food/snacks/carrotfries(get_turf(src)) -======= to_chat(user, "You slice \the [src] into sticks.") - new /obj/item/reagent_containers/food/snacks/carrotfries(get_turf(src)) ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + new /obj/item/weapon/reagent_containers/food/snacks/carrotfries(get_turf(src)) qdel(src) return if(!isnull(seed.chems["pineapplejuice"])) -<<<<<<< HEAD - to_chat(user, "You slice \the [src] into rings.") - new /obj/item/weapon/reagent_containers/food/snacks/pineapple_ring(get_turf(src)) -======= to_chat(user, "You slice \the [src] into rings.") - new /obj/item/reagent_containers/food/snacks/pineapple_ring(get_turf(src)) ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + new /obj/item/weapon/reagent_containers/food/snacks/pineapple_ring(get_turf(src)) qdel(src) return if(!isnull(seed.chems["soymilk"])) -<<<<<<< HEAD - to_chat(user, "You roughly chop up \the [src].") - new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src)) -======= to_chat(user, "You roughly chop up \the [src].") - new /obj/item/reagent_containers/food/snacks/soydope(get_turf(src)) ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src)) qdel(src) return @@ -340,11 +316,7 @@ if(NG.get_amount() >= NG.max_amount) continue NG.attackby(G, user) -<<<<<<< HEAD - to_chat(user, "You add the newly-formed carpet to the stack. It now contains [G.get_amount()] tiles.") -======= - to_chat(user, "You add the newly-formed grass to the stack. It now contains [G.amount] tiles.") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + to_chat(user, "You add the newly-formed carpet to the stack. It now contains [G.get_amount()] tiles.") qdel(src) return diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index 2f3e7fcc55..8919b4ede5 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -68,25 +68,15 @@ active = 0 if(failed_task) failed_task = 0 -<<<<<<< HEAD - visible_message("\icon[src][bicon(src)] [src] pings unhappily, flashing a red warning light.") + visible_message("\icon[src][bicon(src)] [src] pings unhappily, flashing a red warning light.") else - visible_message("\icon[src][bicon(src)] [src] pings happily.") -======= - visible_message("[bicon(src)] [src] pings unhappily, flashing a red warning light.") - else - visible_message("[bicon(src)] [src] pings happily.") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + visible_message("\icon[src][bicon(src)] [src] pings happily.") if(eject_disk) eject_disk = 0 if(loaded_disk) loaded_disk.loc = get_turf(src) -<<<<<<< HEAD - visible_message("\icon[src][bicon(src)] [src] beeps and spits out [loaded_disk].") -======= - visible_message("[bicon(src)] [src] beeps and spits out [loaded_disk].") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + visible_message("\icon[src][bicon(src)] [src] beeps and spits out [loaded_disk].") loaded_disk = null /obj/machinery/botany/attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -179,46 +169,7 @@ data["hasGenetics"] = 0 data["sourceName"] = 0 -<<<<<<< HEAD return data -======= - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "botany_isolator.tmpl", "Lysis-isolation Centrifuge UI", 470, 450) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) - -/obj/machinery/botany/Topic(href, href_list) - - if(..()) - return 1 - - if(href_list["eject_packet"]) - if(!seed) return - seed.loc = get_turf(src) - - if(seed.seed.name == "new line" || isnull(plant_controller.seeds[seed.seed.name])) - seed.seed.uid = plant_controller.seeds.len + 1 - seed.seed.name = "[seed.seed.uid]" - plant_controller.seeds[seed.seed.name] = seed.seed - - seed.update_seed() - visible_message("[bicon(src)] [src] beeps and spits out [seed].") - - seed = null - - if(href_list["eject_disk"]) - if(!loaded_disk) return - loaded_disk.loc = get_turf(src) - visible_message("[bicon(src)] [src] beeps and spits out [loaded_disk].") - loaded_disk = null - - usr.set_machine(src) - src.add_fingerprint(usr) - -/obj/machinery/botany/extractor/Topic(href, href_list) ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) /obj/machinery/botany/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) if(..()) diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm index cd0a1036ee..cf8fd8d581 100644 --- a/code/modules/hydroponics/trays/tray_tools.dm +++ b/code/modules/hydroponics/trays/tray_tools.dm @@ -39,25 +39,11 @@ ui = new(user, src, "PlantAnalyzer", name) ui.open() -<<<<<<< HEAD /obj/item/device/analyzer/plant_analyzer/tgui_state(mob/user) return GLOB.tgui_inventory_state /obj/item/device/analyzer/plant_analyzer/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = ..() -======= -/obj/item/analyzer/plant_analyzer/proc/print_report(var/mob/living/user) - if(!last_data) - to_chat(user, "There is no scan data to print.") - return - var/obj/item/paper/P = new /obj/item/paper(get_turf(src)) - P.name = "paper - [form_title]" - P.info = "[last_data]" - if(istype(user,/mob/living/carbon/human)) - user.put_in_hands(P) - user.visible_message("\The [src] spits out a piece of paper.") - return ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) var/datum/seed/grown_seed = last_seed if(!istype(grown_seed)) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 7c16f5bc6c..6819453fac 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -892,11 +892,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp lighting_alpha = darkness_levels[index] updateghostsight() -<<<<<<< HEAD - to_chat(src, "Your vision now has [darkness_names[index]].") -======= - to_chat(src, "You [seedarkness ? "now" : "no longer"] see darkness.") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + to_chat(src, "Your vision now has [darkness_names[index]].") /mob/observer/dead/proc/updateghostsight() plane_holder.set_desired_alpha(VIS_LIGHTING, lighting_alpha) diff --git a/code/modules/mob/dead/observer/observer_vr.dm b/code/modules/mob/dead/observer/observer_vr.dm index 56daefb1d2..d138a0b163 100644 --- a/code/modules/mob/dead/observer/observer_vr.dm +++ b/code/modules/mob/dead/observer/observer_vr.dm @@ -68,7 +68,7 @@ var/datum/transcore_db/db = SStranscore.db_by_mind_name(mind.name) if(db) var/datum/transhuman/mind_record/record = db.backed_up[src.mind.name] - if(!(record.dead_state == MR_DEAD)) + if(!(record.dead_state == MR_DEAD)) if((world.time - timeofdeath ) > 5 MINUTES) //Allows notify transcore to be used if you have an entry but for some reason weren't marked as dead record.dead_state = MR_DEAD //Such as if you got scanned but didn't take an implant. It's a little funky, but I mean, you got scanned db.notify(record) //So you probably will want to let someone know if you die. @@ -115,7 +115,7 @@ var/input = tgui_input_list(usr, "Select a ghost pod:", "Ghost Jump", observe_list_format(active_ghost_pods)) if(!input) - to_chat(src, "No active ghost pods detected.") + to_chat(src, "No active ghost pods detected.") return var/target = observe_list_format(active_ghost_pods)[input] @@ -129,7 +129,7 @@ forceMove(T) stop_following() else - to_chat(src, "This ghost pod is not located in the game world.") + to_chat(src, "This ghost pod is not located in the game world.") /mob/observer/dead/verb/findautoresleever() set category = "Ghost" @@ -156,5 +156,5 @@ if(!L) to_chat(src, "There appears to be something wrong with this auto-resleever, try again.") return - + forceMove(L) diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index 78e03d12c4..1bf764f1db 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -140,21 +140,13 @@ /mob/proc/on_hear_say(var/message) to_chat(src, "[message]") if(teleop) -<<<<<<< HEAD - to_chat(teleop, create_text_tag("body", "BODY:", teleop.client) + "[message]") -======= to_chat(teleop, "[create_text_tag("body", "BODY:", teleop.client)][message]") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) /mob/living/silicon/on_hear_say(var/message) var/time = say_timestamp() to_chat(src, "[time] [message]") if(teleop) -<<<<<<< HEAD - to_chat(teleop, create_text_tag("body", "BODY:", teleop.client) + "[time] [message]") -======= to_chat(teleop, "[create_text_tag("body", "BODY:", teleop.client)][time] [message]") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) // Checks if the mob's own name is included inside message. Handles both first and last names. /mob/proc/check_mentioned(var/message) @@ -204,65 +196,39 @@ if(prob(20)) to_chat(src, "You feel your headset vibrate but can hear nothing from it!") else -<<<<<<< HEAD - on_hear_radio(part_a, speaker_name, track, part_b, message, part_c) -======= on_hear_radio(part_a, part_b, speaker_name, track, part_c, message, part_d, part_e) ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) /proc/say_timestamp() return "\[[stationtime2text()]\]" -<<<<<<< HEAD -/mob/proc/on_hear_radio(part_a, speaker_name, track, part_b, formatted, part_c) - var/final_message = "[part_a][speaker_name][part_b][formatted][part_c]" -======= /mob/proc/on_hear_radio(part_a, part_b, speaker_name, track, part_c, formatted, part_d, part_e) var/final_message = "[part_b][speaker_name][part_c][formatted][part_d]" ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) if(check_mentioned(formatted) && is_preference_enabled(/datum/client_preference/check_mention)) final_message = "[part_a][final_message][part_e]" else final_message = "[part_a][final_message][part_e]" to_chat(src, final_message) -<<<<<<< HEAD -/mob/observer/dead/on_hear_radio(part_a, speaker_name, track, part_b, formatted, part_c) - var/final_message = "[part_a][track][part_b][formatted][part_c]" -======= /mob/observer/dead/on_hear_radio(part_a, part_b, speaker_name, track, part_c, formatted, part_d, part_e) var/final_message = "[part_b][track][part_c][formatted][part_d]" ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) if(check_mentioned(formatted) && is_preference_enabled(/datum/client_preference/check_mention)) final_message = "[part_a][final_message][part_e]" else final_message = "[part_a][final_message][part_e]" to_chat(src, final_message) -<<<<<<< HEAD -/mob/living/silicon/on_hear_radio(part_a, speaker_name, track, part_b, formatted, part_c) - var/time = say_timestamp() - var/final_message = "[part_a][speaker_name][part_b][formatted][part_c]" -======= /mob/living/silicon/on_hear_radio(part_a, part_b, speaker_name, track, part_c, formatted, part_d, part_e) var/time = say_timestamp() var/final_message = "[part_b][speaker_name][part_c][formatted][part_d]" ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) if(check_mentioned(formatted) && is_preference_enabled(/datum/client_preference/check_mention)) final_message = "[part_a][time][final_message][part_e]" else final_message = "[part_a][time][final_message][part_e]" to_chat(src, final_message) -<<<<<<< HEAD -/mob/living/silicon/ai/on_hear_radio(part_a, speaker_name, track, part_b, formatted, part_c) - var/time = say_timestamp() - var/final_message = "[part_a][track][part_b][formatted][part_c]" -======= /mob/living/silicon/ai/on_hear_radio(part_a, part_b, speaker_name, track, part_c, formatted, part_d, part_e) var/time = say_timestamp() var/final_message = "[part_b][track][part_c][formatted][part_d]" ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) if(check_mentioned(formatted) && is_preference_enabled(/datum/client_preference/check_mention)) final_message = "[part_a][time][final_message][part_e]" else @@ -274,13 +240,8 @@ return if(say_understands(speaker, language)) -<<<<<<< HEAD - message = "[speaker] [verb_understood], \"[message]\"" + message = "[speaker] [verb_understood], \"[message]\"" else if(!(language.ignore_adverb)) -======= - message = "[speaker] [verb], \"[message]\"" - else ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) var/adverb var/length = length(message) * pick(0.8, 0.9, 1.0, 1.1, 1.2) //Adds a little bit of fuzziness switch(length) @@ -289,13 +250,9 @@ if(30 to 48) adverb = " a message" if(48 to 90) adverb = " a lengthy message" else adverb = " a very lengthy message" -<<<<<<< HEAD - message = "[speaker] [verb][adverb]." - else - message = "[speaker] [verb]." -======= message = "[speaker] [verb][adverb]." ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + else + message = "[speaker] [verb]." show_message(message, type = speech_type) // Type 1 is visual message diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index aa21381bbc..7c2a2b520d 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -60,7 +60,7 @@ message = "reveals their wings!" else message = "hides their wings." - visible_message("[src] [message]") + visible_message("[src] [message]") /mob/living/carbon/human/verb/hide_tail_vr() set name = "Show/Hide tail" @@ -83,4 +83,4 @@ message = "reveals their tail!" else message = "hides their tail." - visible_message("[src] [message]") \ No newline at end of file + visible_message("[src] [message]") \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index c4d3cd530d..fa67e7a510 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -386,18 +386,9 @@ for (var/datum/data/record/R in data_core.security) if (R.fields["id"] == E.fields["id"]) if(hasHUD(usr,"security")) -<<<<<<< HEAD - to_chat(usr, "Name: [R.fields["name"]] Criminal Status: [R.fields["criminal"]]") - to_chat(usr, "Species: [R.fields["species"]]") - to_chat(usr, "Minor Crimes: [R.fields["mi_crim"]]") - to_chat(usr, "Details: [R.fields["mi_crim_d"]]") - to_chat(usr, "Major Crimes: [R.fields["ma_crim"]]") - to_chat(usr, "Details: [R.fields["ma_crim_d"]]") - to_chat(usr, "Notes: [R.fields["notes"]]") - to_chat(usr, "\[View Comment Log\]") -======= var/list/security_hud_text = list() security_hud_text += "Name: [R.fields["name"]] Criminal Status: [R.fields["criminal"]]" + security_hud_text += "Species: [R.fields["species"]]" security_hud_text += "Minor Crimes: [R.fields["mi_crim"]]" security_hud_text += "Details: [R.fields["mi_crim_d"]]" security_hud_text += "Major Crimes: [R.fields["ma_crim"]]" @@ -405,7 +396,6 @@ security_hud_text += "Notes: [R.fields["notes"]]" security_hud_text += "\[View Comment Log\]" to_chat(usr, "[jointext(security_hud_text, "
")]") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) read = 1 if(!read) @@ -515,19 +505,9 @@ for (var/datum/data/record/R in data_core.medical) if (R.fields["id"] == E.fields["id"]) if(hasHUD(usr,"medical")) -<<<<<<< HEAD - to_chat(usr, "Name: [R.fields["name"]] Blood Type: [R.fields["b_type"]]") - to_chat(usr, "Species: [R.fields["species"]]") - to_chat(usr, "DNA: [R.fields["b_dna"]]") - to_chat(usr, "Minor Disabilities: [R.fields["mi_dis"]]") - to_chat(usr, "Details: [R.fields["mi_dis_d"]]") - to_chat(usr, "Major Disabilities: [R.fields["ma_dis"]]") - to_chat(usr, "Details: [R.fields["ma_dis_d"]]") - to_chat(usr, "Notes: [R.fields["notes"]]") - to_chat(usr, "\[View Comment Log\]") -======= var/list/medical_hud_text = list() medical_hud_text += "Name: [R.fields["name"]] Blood Type: [R.fields["b_type"]]" + medical_hud_text += "Species: [R.fields["species"]]" medical_hud_text += "DNA: [R.fields["b_dna"]]" medical_hud_text += "Minor Disabilities: [R.fields["mi_dis"]]" medical_hud_text += "Details: [R.fields["mi_dis_d"]]" @@ -536,7 +516,6 @@ medical_hud_text += "Notes: [R.fields["notes"]]" medical_hud_text += "\[View Comment Log\]" to_chat(usr, "[jointext(medical_hud_text, "
")]") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) read = 1 if(!read) @@ -610,21 +589,23 @@ for (var/datum/data/record/R in data_core.general) if (R.fields["id"] == E.fields["id"]) if(hasHUD(usr,"best")) - to_chat(usr, "Name: [R.fields["name"]]") - to_chat(usr, "Species: [R.fields["species"]]") - to_chat(usr, "Assignment: [R.fields["real_rank"]] ([R.fields["rank"]])") - to_chat(usr, "Home System: [R.fields["home_system"]]") - to_chat(usr, "Birthplace: [R.fields["birthplace"]]") - to_chat(usr, "Citizenship: [R.fields["citizenship"]]") - to_chat(usr, "Primary Employer: [R.fields["personal_faction"]]") - to_chat(usr, "Religious Beliefs: [R.fields["religion"]]") - to_chat(usr, "Known Languages: [R.fields["languages"]]") - to_chat(usr, "Notes: [R.fields["notes"]]") - to_chat(usr, "\[View Comment Log\]") + var/list/emp_hud_text = list() + emp_hud_text += "Name: [R.fields["name"]]" + emp_hud_text += "Species: [R.fields["species"]]" + emp_hud_text += "Assignment: [R.fields["real_rank"]] ([R.fields["rank"]])" + emp_hud_text += "Home System: [R.fields["home_system"]]" + emp_hud_text += "Birthplace: [R.fields["birthplace"]]" + emp_hud_text += "Citizenship: [R.fields["citizenship"]]" + emp_hud_text += "Primary Employer: [R.fields["personal_faction"]]" + emp_hud_text += "Religious Beliefs: [R.fields["religion"]]" + emp_hud_text += "Known Languages: [R.fields["languages"]]" + emp_hud_text += "Notes: [R.fields["notes"]]" + emp_hud_text += "\[View Comment Log\]" + to_chat(usr, "[jointext(emp_hud_text, "
")]") read = 1 if(!read) - to_chat(usr, "Unable to locate a data core entry for this person.") + to_chat(usr, "Unable to locate a data core entry for this person.") if (href_list["emprecordComment"]) if(hasHUD(usr,"best")) @@ -647,11 +628,11 @@ to_chat(usr, "[R.fields[text("com_[]", counter)]]") counter++ if (counter == 1) - to_chat(usr, "No comment found") - to_chat(usr, "\[Add comment\]") + to_chat(usr, "No comment found.") + to_chat(usr, "\[Add comment\]") if(!read) - to_chat(usr, "Unable to locate a data core entry for this person.") + to_chat(usr, "Unable to locate a data core entry for this person.") if (href_list["emprecordadd"]) if(hasHUD(usr,"best")) @@ -920,19 +901,11 @@ var/list/creatures = list() for(var/mob/living/carbon/h in mob_list) creatures += h -<<<<<<< HEAD var/mob/target = tgui_input_list(usr, "Who do you want to project your mind to?", "Project Mind", creatures) if (isnull(target)) return - var/say = sanitize(tgui_input_text(usr, "What do you wish to say")) -======= - var/mob/target = input("Who do you want to project your mind to?") as null|anything in creatures - if (isnull(target)) - return - - var/say = sanitize(input("What do you wish to say?")) ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + var/say = sanitize(tgui_input_text(usr, "What do you wish to say?")) if(mRemotetalk in target.mutations) target.show_message("You hear [src.real_name]'s voice: [say]") else diff --git a/code/modules/mob/living/carbon/human/species/species_attack_vr.dm b/code/modules/mob/living/carbon/human/species/species_attack_vr.dm index 11a6d14973..513f616b8e 100644 --- a/code/modules/mob/living/carbon/human/species/species_attack_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_attack_vr.dm @@ -19,30 +19,30 @@ switch(attack_damage) if(1 to 2) user.visible_message("[user]'s fangs scrape across [target]'s cheek!") - to_chat(target, "Your face feels tingly!") + to_chat(target, "Your face feels tingly!") target.bloodstr.add_reagent("numbenzyme",attack_damage) //Have to add this here, otherwise the swtich fails. if(3 to 4) user.visible_message("[user]'s fangs pierce into [target]'s neck at an odd, awkward angle!") - to_chat(target, "Your neck feels like it's on fire before going numb!") + to_chat(target, "Your neck feels like it's on fire before going numb!") target.bloodstr.add_reagent("numbenzyme",attack_damage) if(5) user.visible_message("[user] sinks \his [pick(attack_noun)] deep into [target]'s neck, causing the vein to bulge outwards at some type of chemical is pumped into it!") - to_chat(target, "Your neck feels like it's going to burst! Moments later, you simply can't feel your neck any longer, the numbness beginning to spread throughout your body!") + to_chat(target, "Your neck feels like it's going to burst! Moments later, you simply can't feel your neck any longer, the numbness beginning to spread throughout your body!") target.bloodstr.add_reagent("numbenzyme",attack_damage) else // ----- BODY ----- // switch(attack_damage) if(1 to 2) user.visible_message("[user]'s fangs scrape across [target]'s [affecting.name]!") - to_chat(target, "Your [affecting.name] feels tingly!") + to_chat(target, "Your [affecting.name] feels tingly!") target.bloodstr.add_reagent("numbenzyme",attack_damage) if(3 to 4) user.visible_message("[user]'s fangs pierce [pick("", "", "the side of")] [target]'s [affecting.name]!") - to_chat(target, "Your [affecting.name] feels like it's on fire before going numb!") + to_chat(target, "Your [affecting.name] feels like it's on fire before going numb!") target.bloodstr.add_reagent("numbenzyme",attack_damage) if(5) user.visible_message("[user]'s fangs sink deep into [target]'s [affecting.name], one of their veins bulging outwards from the sudden fluid pumped into it!") - to_chat(target, "Your [affecting.name] feels like it's going to burst! Moments later, you simply can't feel your [affecting.name] any longer, the numbness slowly spreading throughout your body!") + to_chat(target, "Your [affecting.name] feels like it's going to burst! Moments later, you simply can't feel your [affecting.name] any longer, the numbness slowly spreading throughout your body!") target.bloodstr.add_reagent("numbenzyme",attack_damage) /datum/unarmed_attack/claws/shadekin diff --git a/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm b/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm index ed744e9fb6..1b7e3386da 100644 --- a/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm @@ -189,5 +189,5 @@ species.base_species = new_species wrapped_species_by_ref["\ref[src]"] = new_species if (visible) - visible_message("\The [src] shifts and contorts, taking the form of \a [new_species]!") + visible_message("\The [src] shifts and contorts, taking the form of \a [new_species]!") regenerate_icons() \ No newline at end of file diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 2f512e5090..311682f056 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -697,13 +697,13 @@ //VOREStation Edit Start - Making it so SSD people have prefs with fallback to original style. if(config.allow_Metadata) if(ooc_notes) - to_chat(usr, "[src]'s Metainfo:
[ooc_notes]") + to_chat(usr, "[src]'s Metainfo:
[ooc_notes]") else if(client) - to_chat(usr, "[src]'s Metainfo:
[client.prefs.metadata]") + to_chat(usr, "[src]'s Metainfo:
[client.prefs.metadata]") else - to_chat(usr, "[src] does not have any stored infomation!") + to_chat(usr, "[src] does not have any stored infomation!") else - to_chat(usr, "OOC Metadata is not supported by this server!") + to_chat(usr, "OOC Metadata is not supported by this server!") //VOREStation Edit End - Making it so SSD people have prefs with fallback to original style. return @@ -1125,23 +1125,7 @@ src.inertia_dir = get_dir(target, src) step(src, inertia_dir) item.throw_at(target, throw_range, item.throw_speed, src) -<<<<<<< HEAD item.throwing = 1 //Small edit so thrown interactions actually work! -======= - - return TRUE - return FALSE - - if(a_intent == I_HELP && Adjacent(target) && isitem(item)) - if(ishuman(target)) - var/mob/living/carbon/human/H = target - if(H.in_throw_mode && H.a_intent == I_HELP && unEquip(item)) - H.put_in_hands(item) // If this fails it will just end up on the floor, but that's fitting for things like dionaea. - visible_message("[src] hands \the [H] \a [item].", SPAN_NOTICE("You give \the [target] \a [item].")) - else - to_chat(src, SPAN_NOTICE("You offer \the [item] to \the [target].")) - do_give(H) ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) return TRUE else return FALSE @@ -1154,7 +1138,7 @@ var/mob/living/carbon/human/H = target if(H.in_throw_mode && H.a_intent == I_HELP && unEquip(I)) H.put_in_hands(I) // If this fails it will just end up on the floor, but that's fitting for things like dionaea. - visible_message("[src] hands \the [H] \a [I].", SPAN_NOTICE("You give \the [target] \a [I].")) + visible_message("[src] hands \the [H] \a [I].", SPAN_NOTICE("You give \the [target] \a [I].")) else to_chat(src, SPAN_NOTICE("You offer \the [I] to \the [target].")) do_give(H) diff --git a/code/modules/mob/living/living_vr.dm b/code/modules/mob/living/living_vr.dm index ad35515ef1..0bebfdd32f 100644 --- a/code/modules/mob/living/living_vr.dm +++ b/code/modules/mob/living/living_vr.dm @@ -30,7 +30,7 @@ var/new_metadata = sanitize(tgui_input_text(usr, "Enter any information you'd like others to see, such as Roleplay-preferences. This will not be saved permanently, only for this round.", "Game Preference" , html_decode(ooc_notes), multiline = TRUE, prevent_enter = TRUE), extra = 0) if(new_metadata && CanUseTopic(usr)) ooc_notes = new_metadata - to_chat(usr, "OOC notes updated.") + to_chat(usr, "OOC notes updated.") log_admin("[key_name(usr)] updated their OOC notes mid-round.") /mob/living/verb/set_voice_freq() diff --git a/code/modules/mob/living/riding.dm b/code/modules/mob/living/riding.dm index 02c35132a6..08a2f88970 100644 --- a/code/modules/mob/living/riding.dm +++ b/code/modules/mob/living/riding.dm @@ -10,12 +10,7 @@ to_chat(src, "Rider control enabled.") return else -<<<<<<< HEAD riding_datum.keytype = /obj/item/weapon/material/twohanded/riding_crop - to_chat(src, "Rider control restricted.") -======= - riding_datum.keytype = /obj/item/material/twohanded/riding_crop to_chat(src, "Rider control restricted.") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) return return diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index ed1a9bab3c..677372d0e4 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -758,13 +758,8 @@ var/list/ai_verbs_default = list( if(!do_after(user,40 * W.toolspeed)) user.visible_message("\The [user] decides not to unbolt \the [src].") return -<<<<<<< HEAD - user.visible_message("\The [user] finishes unfastening \the [src]!") - anchored = FALSE -======= user.visible_message("\The [user] finishes unfastening \the [src]!") - anchored = 0 ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + anchored = FALSE return else playsound(src, W.usesound, 50, 1) @@ -772,13 +767,8 @@ var/list/ai_verbs_default = list( if(!do_after(user,40 * W.toolspeed)) user.visible_message("\The [user] decides not to bolt \the [src].") return -<<<<<<< HEAD - user.visible_message("\The [user] finishes fastening down \the [src]!") - anchored = TRUE -======= user.visible_message("\The [user] finishes fastening down \the [src]!") - anchored = 1 ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + anchored = TRUE return else return ..() @@ -809,16 +799,12 @@ var/list/ai_verbs_default = list( set desc = "Toggles hologram movement based on moving with your virtual eye." hologram_follow = !hologram_follow -<<<<<<< HEAD //VOREStation Add - Required to stop movement because we use walk_to(wards) in hologram.dm if(holo) var/obj/effect/overlay/aiholo/hologram = holo.masters[src] walk(hologram, 0) //VOREStation Add End - to_chat(usr, "Your hologram will [hologram_follow ? "follow" : "no longer follow"] you now.") -======= to_chat(usr, "Your hologram will [hologram_follow ? "follow" : "no longer follow"] you now.") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) /mob/living/silicon/ai/proc/check_unable(var/flags = 0, var/feedback = 1) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index c1a617691d..402b21a390 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -295,14 +295,10 @@ canmove = TRUE var/turf/T = get_turf(src) -<<<<<<< HEAD - if(istype(T)) T.visible_message("[src] folds outwards, expanding into a mobile form.") + if(istype(T)) T.visible_message("[src] folds outwards, expanding into a mobile form.") verbs |= /mob/living/silicon/pai/proc/pai_nom verbs |= /mob/living/proc/vertical_nom update_icon() -======= - if(istype(T)) T.visible_message("[src] folds outwards, expanding into a mobile form.") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) /mob/living/silicon/pai/verb/fold_up() set category = "pAI Commands" @@ -368,13 +364,9 @@ //update_transform() I want this to make you ROTATE like normal HUMANS do! But! There's lots of problems and I don't know how to fix them! else resting = !resting -<<<<<<< HEAD icon_state = resting ? "[chassis]_rest" : "[chassis]" update_icon() //VOREStation edit - to_chat(src, "You are now [resting ? "resting" : "getting up"]") -======= - to_chat(src, "You are now [resting ? "resting" : "getting up"].") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + to_chat(src, "You are now [resting ? "resting" : "getting up"].") canmove = !resting @@ -444,11 +436,7 @@ release_vore_contents(FALSE) //VOREStation Add var/turf/T = get_turf(src) -<<<<<<< HEAD - if(istype(T) && !silent) T.visible_message("[src] neatly folds inwards, compacting down to a rectangular card.") -======= - if(istype(T)) T.visible_message("[src] neatly folds inwards, compacting down to a rectangular card.") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + if(istype(T) && !silent) T.visible_message("[src] neatly folds inwards, compacting down to a rectangular card.") if(client) src.stop_pulling() diff --git a/code/modules/mob/living/silicon/pai/pai_vr.dm b/code/modules/mob/living/silicon/pai/pai_vr.dm index 86ef6cca5a..1f6349df05 100644 --- a/code/modules/mob/living/silicon/pai/pai_vr.dm +++ b/code/modules/mob/living/silicon/pai/pai_vr.dm @@ -86,7 +86,7 @@ canmove = TRUE card.setEmotion(15) playsound(card, 'sound/effects/pai-restore.ogg', 50, FALSE) - card.visible_message("\The [card] chimes.", runemessage = "chime") + card.visible_message("\The [card] chimes.", runemessage = "chime") /mob/living/silicon/pai/proc/pai_nom(var/mob/living/T in oview(1)) set name = "pAI Nom" @@ -206,7 +206,7 @@ hide_glow = FALSE update_icon() else - to_chat(src, "Your selected chassis cannot modify its eye glow!") + to_chat(src, "Your selected chassis cannot modify its eye glow!") return @@ -400,7 +400,7 @@ set category = "pAI Commands" set name = "Save Configuration" savefile_save(src) - to_chat(src, "[name] configuration saved to global pAI settings.") + to_chat(src, "[name] configuration saved to global pAI settings.") /mob/living/silicon/pai/a_intent_change(input as text) . = ..() @@ -474,28 +474,28 @@ card.screen_msg = message var/logmsg = "(CARD SCREEN)[message]" log_say(logmsg,src) - to_chat(src, "You print a message to your screen, \"[message]\"") + to_chat(src, "You print a message to your screen, \"[message]\"") if(isliving(card.loc)) var/mob/living/L = card.loc if(L.client) - to_chat(L, "[src.name]'s screen prints, \"[message]\"") + to_chat(L, "[src.name]'s screen prints, \"[message]\"") else return else if(isbelly(card.loc)) var/obj/belly/b = card.loc if(b.owner.client) - to_chat(b.owner, "[src.name]'s screen prints, \"[message]\"") + to_chat(b.owner, "[src.name]'s screen prints, \"[message]\"") else return else if(istype(card.loc, /obj/item/device/pda)) var/obj/item/device/pda/p = card.loc if(isliving(p.loc)) var/mob/living/L = p.loc if(L.client) - to_chat(L, "[src.name]'s screen prints, \"[message]\"") + to_chat(L, "[src.name]'s screen prints, \"[message]\"") else return else if(isbelly(p.loc)) var/obj/belly/b = card.loc if(b.owner.client) - to_chat(b.owner, "[src.name]'s screen prints, \"[message]\"") + to_chat(b.owner, "[src.name]'s screen prints, \"[message]\"") else return else return else return @@ -505,11 +505,11 @@ continue else if(isobserver(G) && G.is_preference_enabled(/datum/client_preference/ghost_ears)) if(is_preference_enabled(/datum/client_preference/whisubtle_vis) || G.client.holder) - to_chat(G, "[src.name]'s screen prints, \"[message]\"") + to_chat(G, "[src.name]'s screen prints, \"[message]\"") /mob/living/silicon/pai/proc/touch_window(soft_name) //This lets us touch TGUI procs and windows that may be nested behind other TGUI procs and windows if(stat != CONSCIOUS) //so we can access our software without having to open up the software interface TGUI window - to_chat(src, "You can't do that right now.") + to_chat(src, "You can't do that right now.") return for(var/thing in software) var/datum/pai_software/S = software[thing] diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm index 9e42278730..e726c233cd 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm @@ -268,15 +268,15 @@ if(user.client && (target in user.client.screen)) to_chat(user, "You need to take \the [target.name] off before cleaning it!") if(istype(target, /obj/structure/sink) || istype(target, /obj/structure/toilet)) //Dog vibes. - user.visible_message("[user] begins to lap up water from [target.name].", "You begin to lap up water from [target.name].") + user.visible_message("[user] begins to lap up water from [target.name].", "You begin to lap up water from [target.name].") if(do_after (user, 50)) water.add_charge(50) - to_chat(src, "You refill some of your water reserves.") + to_chat(src, "You refill some of your water reserves.") else if(water.energy < 5) to_chat(user, "Your mouth feels dry. You should drink up some water .") return else if(istype(target,/obj/effect/decal/cleanable)) - user.visible_message("[user] begins to lick off \the [target.name].", "You begin to lick off \the [target.name]...") + user.visible_message("[user] begins to lick off \the [target.name].", "You begin to lick off \the [target.name]...") if(do_after (user, 50)) to_chat(user, "You finish licking off \the [target.name].") water.use_charge(5) @@ -285,9 +285,9 @@ R.cell.charge += 50 else if(istype(target,/obj/item)) if(istype(target,/obj/item/trash)) - user.visible_message("[user] nibbles away at \the [target.name].", "You begin to nibble away at \the [target.name]...") + user.visible_message("[user] nibbles away at \the [target.name].", "You begin to nibble away at \the [target.name]...") if(do_after (user, 50)) - user.visible_message("[user] finishes eating \the [target.name].", "You finish eating \the [target.name].") + user.visible_message("[user] finishes eating \the [target.name].", "You finish eating \the [target.name].") to_chat(user, "You finish off \the [target.name].") qdel(target) var/mob/living/silicon/robot/R = user @@ -295,9 +295,9 @@ water.use_charge(5) return if(istype(target,/obj/item/weapon/cell)) - user.visible_message("[user] begins cramming \the [target.name] down its throat.", "You begin cramming \the [target.name] down your throat...") + user.visible_message("[user] begins cramming \the [target.name] down its throat.", "You begin cramming \the [target.name] down your throat...") if(do_after (user, 50)) - user.visible_message("[user] finishes gulping down \the [target.name].", "You finish swallowing \the [target.name].") + user.visible_message("[user] finishes gulping down \the [target.name].", "You finish swallowing \the [target.name].") to_chat(user, "You finish off \the [target.name], and gain some charge!") var/mob/living/silicon/robot/R = user var/obj/item/weapon/cell/C = target @@ -305,7 +305,7 @@ water.use_charge(5) qdel(target) return - user.visible_message("[user] begins to lick \the [target.name] clean...", "You begin to lick \the [target.name] clean...") + user.visible_message("[user] begins to lick \the [target.name] clean...", "You begin to lick \the [target.name] clean...") if(do_after (user, 50)) to_chat(user, "You clean \the [target.name].") water.use_charge(5) @@ -333,7 +333,7 @@ if(H.species.lightweight == 1) H.Weaken(3) else - user.visible_message("[user] begins to lick \the [target.name] clean...", "You begin to lick \the [target.name] clean...") + user.visible_message("[user] begins to lick \the [target.name] clean...", "You begin to lick \the [target.name] clean...") if(do_after (user, 50)) to_chat(user, "You clean \the [target.name].") var/obj/effect/decal/cleanable/C = locate() in target @@ -406,7 +406,7 @@ var/new_color = input(usr, "Choose a color to set the light to! (Default is [LIGHT_COLOR_INCANDESCENT_TUBE])", "", selected_color) as color|null if(new_color) selected_color = new_color - to_chat(user, "The light color has been changed.") + to_chat(user, "The light color has been changed.") return else if(uses >= max_uses) @@ -416,7 +416,7 @@ if(glass.energy < 125) to_chat(user, "Insufficient material reserves.") return - to_chat(user, "It has [uses] lights remaining. Attempting to fabricate a replacement. Please stand still.") + to_chat(user, "It has [uses] lights remaining. Attempting to fabricate a replacement. Please stand still.") cooldown = 1 if(do_after(user, 50)) glass.use_charge(125) @@ -425,7 +425,7 @@ else cooldown = 0 else - to_chat(user, "It has [uses] lights remaining.") + to_chat(user, "It has [uses] lights remaining.") return //Pounce stuff for K-9 @@ -447,15 +447,15 @@ /mob/living/silicon/robot/proc/leap() if(last_special > world.time) - to_chat(src, "Your leap actuators are still recharging.") + to_chat(src, "Your leap actuators are still recharging.") return if(cell.charge < 1000) - to_chat(src, "Cell charge too low to continue.") + to_chat(src, "Cell charge too low to continue.") return if(usr.incapacitated(INCAPACITATION_DISABLED)) - to_chat(src, "You cannot leap in your current state.") + to_chat(src, "You cannot leap in your current state.") return var/list/choices = list() @@ -474,7 +474,7 @@ return if(usr.incapacitated(INCAPACITATION_DISABLED)) - to_chat(src, "You cannot leap in your current state.") + to_chat(src, "You cannot leap in your current state.") return last_special = world.time + 10 @@ -526,6 +526,6 @@ icontype = options[choice] var/active_sound = 'sound/effects/bubbles.ogg' playsound(src.loc, "[active_sound]", 100, 0, 4) - M << "Your Tank now displays [choice]. Drink up and enjoy!" + to_chat(M, "Your Tank now displays [choice]. Drink up and enjoy!") updateicon() return 1 diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index f1ec9da9d1..b6194ed43c 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -94,8 +94,10 @@ playsound(src, gulpsound, vol = 60, vary = 1, falloff = 0.1, preference = /datum/client_preference/eating_noises) if(analyzer && istype(target,/obj/item)) var/obj/item/tech_item = target + var/list/tech_levels = list() for(var/T in tech_item.origin_tech) - to_chat(user, "\The [tech_item] has level [tech_item.origin_tech[T]] in [CallTechName(T)].") + tech_levels += "\The [tech_item] has level [tech_item.origin_tech[T]] in [CallTechName(T)]." + to_chat(user, "[jointext(tech_levels, "
")]") if(delivery) if(islist(deliverylists[delivery_tag])) deliverylists[delivery_tag] |= target @@ -627,7 +629,7 @@ for(var/atom/movable/thing in B) thing.forceMove(src) if(ismob(thing)) - to_chat(thing, "As [T] melts away around you, you find yourself in [hound]'s [name]") + to_chat(thing, "As [T] melts away around you, you find yourself in [hound]'s [name].") for(var/obj/item/I in T) if(istype(I,/obj/item/organ/internal/mmi_holder/posibrain)) var/obj/item/organ/internal/mmi_holder/MMI = I diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index 7b4f95cbc1..6501297c3e 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -340,15 +340,9 @@ /obj/item/weapon/form_printer/attack_self(mob/user as mob) deploy_paper(get_turf(src)) -<<<<<<< HEAD /obj/item/weapon/form_printer/proc/deploy_paper(var/turf/T) - T.visible_message("\The [src.loc] dispenses a sheet of crisp white paper.") - new /obj/item/weapon/paper(T) -======= -/obj/item/form_printer/proc/deploy_paper(var/turf/T) T.visible_message("\The [src.loc] dispenses a sheet of crisp white paper.") - new /obj/item/paper(T) ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + new /obj/item/weapon/paper(T) //Personal shielding for the combat module. @@ -454,7 +448,7 @@ if(!user) return if(!user.Adjacent(A)) - to_chat(user, "You can't reach!") + to_chat(user, "You can't reach!") return if(istype(A, /turf)) try_deploy_inflatable(A, user) diff --git a/code/modules/mob/living/silicon/robot/robot_vr.dm b/code/modules/mob/living/silicon/robot/robot_vr.dm index 9209623f5d..39cd6a0487 100644 --- a/code/modules/mob/living/silicon/robot/robot_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_vr.dm @@ -164,9 +164,9 @@ amount = water.energy water.use_charge(amount) E.reagents.add_reagent("water", amount) - to_chat(src, "You refill the extinguisher using your water reserves.") + to_chat(src, "You refill the extinguisher using your water reserves.") else - to_chat(src, "Insufficient water reserves.") + to_chat(src, "Insufficient water reserves.") //RIDING /datum/riding/dogborg diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index befdd8e277..b4e31f7622 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -88,15 +88,10 @@ var/obj/machinery/hologram/holopad/T = src.holo if(T && T.masters[src]) var/rendered = "[name] [message]" -<<<<<<< HEAD - to_chat(src, "Holopad action relayed, [real_name] [message]") + to_chat(src, "Holopad action relayed, [real_name] [message]") var/obj/effect/overlay/aiholo/hologram = T.masters[src] //VOREStation Add for people in the hologram to hear the messages //var/obj/effect/overlay/hologram = T.masters[src] //VOREStation edit. Done above. -======= - to_chat(src, "Holopad action relayed, [real_name] [message]") - var/obj/effect/overlay/hologram = T.masters[src] ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) var/list/in_range = get_mobs_and_objs_in_view_fast(get_turf(hologram), world.view, 2) //Emotes are displayed from the hologram, not the pad var/list/m_viewers = in_range["mobs"] var/list/o_viewers = in_range["objs"] diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index a9f5eecc41..ef91d05b2d 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -223,7 +223,6 @@ var/synth = (L in speech_synthesizer_langs) . += "[L.name] ([get_language_prefix()][L.key])[synth ? default_str : null]
Speech Synthesizer: [synth ? "YES" : "NOT SUPPORTED"]
[L.desc]

" -<<<<<<< HEAD /mob/living/silicon/proc/toggle_sensor_mode() //VOREStation Add to make borgs use omni starts here - Tank, clueless bird if(sensor_type) if(plane_holder) @@ -254,54 +253,6 @@ //hudmode = sensor_type //This is checked in examine.dm on humans, so they can see medical/security records depending on mode //I made it work like omnis with records by adding stuff to examine.dm //VOREStation Add ends here -======= -/mob/living/silicon/proc/toggle_sensor_mode() - var/sensor_type = input("Please select sensor type.", "Sensor Integration", null) in list("Security","Medical","Disable") - switch(sensor_type) - if ("Security") - if(plane_holder) - //Enable Security planes - plane_holder.set_vis(VIS_CH_ID,TRUE) - plane_holder.set_vis(VIS_CH_WANTED,TRUE) - plane_holder.set_vis(VIS_CH_IMPLOYAL,TRUE) - plane_holder.set_vis(VIS_CH_IMPTRACK,TRUE) - plane_holder.set_vis(VIS_CH_IMPCHEM,TRUE) - - //Disable Medical planes - plane_holder.set_vis(VIS_CH_STATUS,FALSE) - plane_holder.set_vis(VIS_CH_HEALTH,FALSE) - - to_chat(src, "Security records overlay enabled.") - if ("Medical") - if(plane_holder) - //Disable Security planes - plane_holder.set_vis(VIS_CH_ID,FALSE) - plane_holder.set_vis(VIS_CH_WANTED,FALSE) - plane_holder.set_vis(VIS_CH_IMPLOYAL,FALSE) - plane_holder.set_vis(VIS_CH_IMPTRACK,FALSE) - plane_holder.set_vis(VIS_CH_IMPCHEM,FALSE) - - //Enable Medical planes - plane_holder.set_vis(VIS_CH_STATUS,TRUE) - plane_holder.set_vis(VIS_CH_HEALTH,TRUE) - - to_chat(src, "Life signs monitor overlay enabled.") - if ("Disable") - if(plane_holder) - //Disable Security planes - plane_holder.set_vis(VIS_CH_ID,FALSE) - plane_holder.set_vis(VIS_CH_WANTED,FALSE) - plane_holder.set_vis(VIS_CH_IMPLOYAL,FALSE) - plane_holder.set_vis(VIS_CH_IMPTRACK,FALSE) - plane_holder.set_vis(VIS_CH_IMPCHEM,FALSE) - - //Disable Medical planes - plane_holder.set_vis(VIS_CH_STATUS,FALSE) - plane_holder.set_vis(VIS_CH_HEALTH,FALSE) - to_chat(src, "Sensor augmentations disabled.") - - hudmode = sensor_type //This is checked in examine.dm on humans, so they can see medical/security records depending on mode ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) /mob/living/silicon/verb/pose() set name = "Set Pose" diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm index c38445b466..6396c6e9e2 100644 --- a/code/modules/mob/say_vr.dm +++ b/code/modules/mob/say_vr.dm @@ -347,13 +347,11 @@ for(var/mob/M as anything in m_viewers) if(M) - if(isobserver(M)) - message = "[message] ([ghost_follow_link(src, M)])" if(isnewplayer(M)) continue if(M.stat == UNCONSCIOUS || M.sleeping > 0) continue - to_chat(M, message) + to_chat(M, "[isobserver(M) ? "[message] ([ghost_follow_link(src, M)])" : message]") log_emote(message, src) /mob/verb/select_speech_bubble() diff --git a/code/modules/nifsoft/nif.dm b/code/modules/nifsoft/nif.dm index 2f8573dbd0..57b469cea9 100644 --- a/code/modules/nifsoft/nif.dm +++ b/code/modules/nifsoft/nif.dm @@ -377,7 +377,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable last_notification = message // TGUI Hook - to_chat(human,"\[\icon[src.big_icon][bicon(src.big_icon)]NIF\] displays, \"[message]\"") + to_chat(human,"\[\icon[src.big_icon][bicon(src.big_icon)]NIF\] displays, \"[message]\"") if(prob(1)) human.visible_message("\The [human] [pick(look_messages)].") if(alert) human << bad_sound diff --git a/code/modules/nifsoft/nifsoft.dm b/code/modules/nifsoft/nifsoft.dm index 06490cf3c5..7b6ecd6323 100644 --- a/code/modules/nifsoft/nifsoft.dm +++ b/code/modules/nifsoft/nifsoft.dm @@ -270,7 +270,7 @@ var/newlaws = tgui_input_text(user, "Please Input Laws", "Compliance Laws", laws, multiline = TRUE, prevent_enter = TRUE) newlaws = sanitize(newlaws,2048) if(newlaws) - to_chat(user,"You set the laws to:
[newlaws]") + to_chat(user,"You set the laws to:
[newlaws]") laws = newlaws /obj/item/weapon/disk/nifsoft/compliance/extra_params() diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm index 6f5ca2edc2..bc1b4a9606 100644 --- a/code/modules/nifsoft/software/13_soulcatcher.dm +++ b/code/modules/nifsoft/software/13_soulcatcher.dm @@ -72,11 +72,11 @@ /datum/nifsoft/soulcatcher/proc/notify_into(var/message) var/sound = nif.good_sound - to_chat(nif.human,"\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\] Soulcatcher displays, \"[message]\"") + to_chat(nif.human,"\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\] Soulcatcher displays, \"[message]\"") nif.human << sound for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs) - to_chat(CS,"\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\] Soulcatcher displays, \"[message]\"") + to_chat(CS,"\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\] Soulcatcher displays, \"[message]\"") CS << sound /datum/nifsoft/soulcatcher/proc/say_into(var/message, var/mob/living/sender, var/mob/eyeobj) @@ -84,13 +84,13 @@ //AR Projecting if(eyeobj) - sender.eyeobj.visible_message("[sender_name] says, \"[message]\"") + sender.eyeobj.visible_message("[sender_name] says, \"[message]\"") //Not AR Projecting else - to_chat(nif.human,"\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\] [sender_name] speaks, \"[message]\"") + to_chat(nif.human,"\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\] [sender_name] speaks, \"[message]\"") for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs) - to_chat(CS,"\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\] [sender_name] speaks, \"[message]\"") + to_chat(CS,"\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\] [sender_name] speaks, \"[message]\"") log_nsay(message,nif.human.real_name,sender) @@ -99,13 +99,13 @@ //AR Projecting if(eyeobj) - sender.eyeobj.visible_message("[sender_name] [message]") + sender.eyeobj.visible_message("[sender_name] [message]") //Not AR Projecting else - to_chat(nif.human,"\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\] [sender_name] [message]") + to_chat(nif.human,"\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\] [sender_name] [message]") for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs) - to_chat(CS,"\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\] [sender_name] [message]") + to_chat(CS,"\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\] [sender_name] [message]") log_nme(message,nif.human.real_name,sender) diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index c2e500503b..dfbf624cf5 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -283,7 +283,6 @@ return ..() /datum/surgery_step/internal/remove_organ/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) -<<<<<<< HEAD var/obj/item/organ/external/affected = target.get_organ(target_zone) var/list/removable_organs = list() for(var/organ in target.internal_organs_by_name) @@ -294,17 +293,13 @@ var/organ_to_remove = tgui_input_list(user, "Which organ do you want to remove?", "Organ Choice", removable_organs) if(!organ_to_remove) //They chose cancel! to_chat(user, "You decide against preparing any organs for removal.") - user.visible_message("[user] starts pulling \the [tool] from [target]'s [affected]", \ - "You start pulling \the [tool] from [target]'s [affected].") + user.visible_message("[user] starts pulling \the [tool] from [target]'s [affected].", \ + "You start pulling \the [tool] from [target]'s [affected].") target.op_stage.current_organ = organ_to_remove - user.visible_message("[user] starts removing [target]'s [target.op_stage.current_organ] with \the [tool].", \ - "You start removing [target]'s [target.op_stage.current_organ] with \the [tool].") -======= user.visible_message("[user] starts removing [target]'s [target.op_stage.current_organ] with \the [tool].", \ "You start removing [target]'s [target.op_stage.current_organ] with \the [tool].") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) target.custom_pain("Someone's ripping out your [target.op_stage.current_organ]!", 100) ..() @@ -462,68 +457,3 @@ user.visible_message("[user]'s hand slips, damaging the flesh in [target]'s [affected.name] with \the [tool]!", \ "Your hand slips, damaging the flesh in [target]'s [affected.name] with \the [tool]!") affected.createwound(BRUISE, 20) -<<<<<<< HEAD -======= - -/////////////////////////////////////////////////////////////// -// Organ Ripping Surgery -/////////////////////////////////////////////////////////////// - -/datum/surgery_step/internal/rip_organ - - allowed_tools = list( - /obj/item/surgical/scalpel/ripper = 100 - ) - - priority = 3 - - blood_level = 3 - - min_duration = 60 - max_duration = 80 - -/datum/surgery_step/internal/rip_organ/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!..()) - return 0 - - if(!istype(tool)) - return FALSE - - target.op_stage.current_organ = null - - var/list/removable_organs = list() - for(var/organ in target.internal_organs_by_name) - var/obj/item/organ/internal/I = target.internal_organs_by_name[organ] - if(istype(I) && I.parent_organ == target_zone) - removable_organs |= organ - - var/organ_to_remove = input(user, "Which organ do you want to remove?") as null|anything in removable_organs - if(!organ_to_remove) - return 0 - - target.op_stage.current_organ = organ_to_remove - return ..() - -/datum/surgery_step/internal/rip_organ/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] starts ripping [target]'s [target.op_stage.current_organ] out with \the [tool].", \ - "You start ripping [target]'s [target.op_stage.current_organ] out with \the [tool].") - target.custom_pain("Someone's ripping out your [target.op_stage.current_organ]!", 100) - ..() - -/datum/surgery_step/internal/rip_organ/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] has ripped [target]'s [target.op_stage.current_organ] out with \the [tool].", \ - "You have ripped [target]'s [target.op_stage.current_organ] out with \the [tool].") - - // Extract the organ! - if(target.op_stage.current_organ) - var/obj/item/organ/O = target.internal_organs_by_name[target.op_stage.current_organ] - if(O && istype(O)) - O.removed(user) - target.op_stage.current_organ = null - -/datum/surgery_step/internal/rip_organ/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!", \ - "Your hand slips, damaging [target]'s [affected.name] with \the [tool]!") - affected.createwound(BRUISE, 20) ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index 516a433965..9e187d087d 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -336,7 +336,6 @@ return ..() /datum/surgery_step/robotics/detatch_organ_robotic/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) -<<<<<<< HEAD var/list/attached_organs = list() //Which organs can we detach? for(var/organ in target.internal_organs_by_name) var/obj/item/organ/I = target.internal_organs_by_name[organ] @@ -350,12 +349,8 @@ return target.op_stage.current_organ = organ_to_remove - user.visible_message("[user] starts to decouple [target]'s [target.op_stage.current_organ] with \the [tool].", \ - "You start to decouple [target]'s [target.op_stage.current_organ] with \the [tool]." ) -======= user.visible_message("[user] starts to decouple [target]'s [target.op_stage.current_organ] with \the [tool].", \ "You start to decouple [target]'s [target.op_stage.current_organ] with \the [tool]." ) ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) ..() /datum/surgery_step/robotics/detatch_organ_robotic/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -401,7 +396,6 @@ return ..() /datum/surgery_step/robotics/attach_organ_robotic/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) -<<<<<<< HEAD var/list/attachable_organs = list() for(var/organ in target.internal_organs_by_name) @@ -417,12 +411,8 @@ target.op_stage.current_organ = organ_to_replace - user.visible_message("[user] begins reattaching [target]'s [target.op_stage.current_organ] with \the [tool].", \ - "You start reattaching [target]'s [target.op_stage.current_organ] with \the [tool].") -======= user.visible_message("[user] begins reattaching [target]'s [target.op_stage.current_organ] with \the [tool].", \ "You start reattaching [target]'s [target.op_stage.current_organ] with \the [tool].") ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) ..() /datum/surgery_step/robotics/attach_organ_robotic/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) diff --git a/code/modules/vchat/js/vchat.min.js b/code/modules/vchat/js/vchat.min.js index 8dce654de0..bcd2c699c7 100644 --- a/code/modules/vchat/js/vchat.min.js +++ b/code/modules/vchat/js/vchat.min.js @@ -1 +1 @@ -!function(){var e=console.log;console.log=function(t){send_debug(t),e.apply(console,arguments)};var t=console.error;console.error=function(e){send_debug(e),t.apply(console,arguments)},window.onerror=function(e,t,s,a,n){var o="";return n&&n.stack&&(o=n.stack),send_debug(e+" ("+t+"@"+s+":"+a+") "+n+"|UA: "+navigator.userAgent+"|Stack: "+o),!0}}();var vchat_opts={msBeforeDropped:3e4,cookiePrefix:"vst-",alwaysShow:["vc_looc","vc_system"],vchatTabsVer:1},DARKMODE_COLORS={buttonBgColor:"#40628a",buttonTextColor:"#FFFFFF",windowBgColor:"#272727",highlightColor:"#009900",tabTextColor:"#FFFFFF",tabBackgroundColor:"#272727"},LIGHTMODE_COLORS={buttonBgColor:"none",buttonTextColor:"#000000",windowBgColor:"none",highlightColor:"#007700",tabTextColor:"#000000",tabBackgroundColor:"none"},set_storage=set_cookie,get_storage=get_cookie,domparser=new DOMParser;storageAvailable("localStorage")&&(set_storage=set_localstorage,get_storage=get_localstorage);var vueapp,vchat_state={ready:!1,byond_ip:null,byond_cid:null,byond_ckey:null,lastPingReceived:0,latency_sent:0,lastId:0};function start_vchat(){start_vue(),vchat_state.ready=!0,push_Topic("done_loading"),push_Topic_showingnum(this.showingnum),doWinset("htmloutput",{"is-visible":!0}),doWinset("oldoutput",{"is-visible":!1}),doWinset("chatloadlabel",{"is-visible":!1}),setInterval(check_ping,vchat_opts.msBeforeDropped),send_debug("VChat Loaded!")}function start_vue(){vueapp=new Vue({el:"#app",data:{messages:[],shown_messages:[],unshown_messages:0,archived_messages:[],tabs:[{name:"Main",categories:[],immutable:!0,active:!0}],unread_messages:{},editing:!1,paused:!1,latency:0,reconnecting:!1,ext_styles:"",is_admin:!1,inverted:!1,crushing:3,animated:!1,fontsize:.9,lineheight:130,showingnum:200,type_table:[{matches:".filter_say, .say, .emote, .emote_subtle",becomes:"vc_localchat",pretty:"Local Chat",tooltip:"In-character local messages (say, emote, etc)",required:!1,admin:!1},{matches:".filter_radio, .alert, .syndradio, .centradio, .airadio, .entradio, .comradio, .secradio, .engradio, .medradio, .sciradio, .supradio, .srvradio, .expradio, .radio, .deptradio, .newscaster",becomes:"vc_radio",pretty:"Radio Comms",tooltip:"All departments of radio messages",required:!1,admin:!1},{matches:".filter_notice, .notice:not(.pm), .adminnotice, .info, .sinister, .cult",becomes:"vc_info",pretty:"Notices",tooltip:"Non-urgent messages from the game and items",required:!1,admin:!1},{matches:".filter_warning, .warning:not(.pm), .critical, .userdanger, .italics",becomes:"vc_warnings",pretty:"Warnings",tooltip:"Urgent messages from the game and items",required:!1,admin:!1},{matches:".filter_deadsay, .deadsay",becomes:"vc_deadchat",pretty:"Deadchat",tooltip:"All of deadchat",required:!1,admin:!1},{matches:".filter_ooc, .ooc:not(.looc)",becomes:"vc_globalooc",pretty:"Global OOC",tooltip:"The bluewall of global OOC messages",required:!1,admin:!1},{matches:".nif",becomes:"vc_nif",pretty:"NIF Messages",tooltip:"Messages from the NIF itself and people inside",required:!1,admin:!1},{matches:".mentor_channel, .mentor",becomes:"vc_mentor",pretty:"Mentor messages",tooltip:"Mentorchat and mentor pms",required:!1,admin:!1},{matches:".filter_pm, .pm",becomes:"vc_adminpm",pretty:"Admin PMs",tooltip:"Messages to/from admins ('adminhelps')",required:!1,admin:!1},{matches:".filter_ASAY, .admin_channel",becomes:"vc_adminchat",pretty:"Admin Chat",tooltip:"ASAY messages",required:!1,admin:!0},{matches:".filter_MSAY, .mod_channel",becomes:"vc_modchat",pretty:"Mod Chat",tooltip:"MSAY messages",required:!1,admin:!0},{matches:".filter_ESAY, .event_channel",becomes:"vc_eventchat",pretty:"Event Chat",tooltip:"ESAY messages",required:!1,admin:!0},{matches:".filter_combat, .danger",becomes:"vc_combat",pretty:"Combat Logs",tooltip:"Urist McTraitor has stabbed you with a knife!",required:!1,admin:!1},{matches:".filter_adminlogs, .log_message",becomes:"vc_adminlogs",pretty:"Admin Logs",tooltip:"ADMIN LOG: Urist McAdmin has jumped to coordinates X, Y, Z",required:!1,admin:!0},{matches:".filter_attacklogs",becomes:"vc_attacklogs",pretty:"Attack Logs",tooltip:"Urist McTraitor has shot John Doe",required:!1,admin:!0},{matches:".filter_debuglogs",becomes:"vc_debuglogs",pretty:"Debug Logs",tooltip:"DEBUG: SSPlanets subsystem Recover().",required:!1,admin:!0},{matches:".ooc.looc, .ooc, .looc",becomes:"vc_looc",pretty:"Local OOC",tooltip:"Local OOC messages, always enabled",required:!0},{matches:".boldannounce, .filter_system",becomes:"vc_system",pretty:"System Messages",tooltip:"Messages from your client, always enabled",required:!0}]},mounted:function(){this.load_settings();var e=new XMLHttpRequest;e.open("GET","ss13styles.css"),e.onreadystatechange=function(){this.ext_styles=e.responseText}.bind(this),e.send()},updated:function(){this.editing||this.paused||window.scrollTo(0,document.getElementById("messagebox").scrollHeight)},watch:{reconnecting:function(e,t){1==e&&0==t?this.internal_message("Your client has lost connection to the server, or there is severe lag. Your client will reconnect if possible."):0==e&&1==t&&this.internal_message("Your client has reconnected to the server.")},inverted:function(e){set_storage("darkmode",e),e?(document.body.classList.add("inverted"),switch_ui_mode(DARKMODE_COLORS)):(document.body.classList.remove("inverted"),switch_ui_mode(LIGHTMODE_COLORS))},crushing:function(e){set_storage("crushing",e)},animated:function(e){set_storage("animated",e)},fontsize:function(e,t){isNaN(e)?this.fontsize=t:(e<.2?this.fontsize=.2:e>5&&(this.fontsize=5),set_storage("fontsize",e))},lineheight:function(e,t){isFinite(e)?(e<100?this.lineheight=100:e>200&&(this.lineheight=200),set_storage("lineheight",e)):this.lineheight=t},showingnum:function(e,t){isFinite(e)?((e=Math.floor(e))<50?this.showingnum=50:e>2e3&&(this.showingnum=2e3),set_storage("showingnum",this.showingnum),push_Topic_showingnum(this.showingnum),this.attempt_archive()):this.showingnum=t},current_categories:function(e,t){e.length&&this.apply_filter(e)}},computed:{active_tab:function(){return this.tabs.find((function(e){return e.active}))},ping_classes:function(){return this.latency?"?"==this.latency?"grey":this.latency<0?"red":this.latency<=200?"green":this.latency<=400?"yellow":"grey":this.reconnecting?"red":"green"},current_categories:function(){return this.active_tab==this.tabs[0]?[]:this.active_tab.categories.concat(vchat_opts.alwaysShow)}},methods:{load_settings:function(){this.inverted=get_storage("darkmode",!1),this.crushing=get_storage("crushing",3),this.animated=get_storage("animated",!1),this.fontsize=get_storage("fontsize",.9),this.lineheight=get_storage("lineheight",130),this.showingnum=get_storage("showingnum",200),isNaN(this.crushing)&&(this.crushing=3),isNaN(this.fontsize)&&(this.fontsize=.9),this.load_tabs()},load_tabs:function(){var e=get_storage("tabs");if(e){var t=JSON.parse(e);t.version&&t.tabs?!t.version!=vchat_opts.vchatTabsVer?this.tabs.push.apply(this.tabs,t.tabs):this.internal_message("Your saved tabs are for an older version of VChat and must be recreated, sorry."):this.internal_message("There was a problem loading your tabs. Any new ones you make will be saved, however.")}},save_tabs:function(){var e={version:vchat_opts.vchatTabsVer,tabs:[]};this.tabs.forEach((function(t){if(!t.immutable){var s=t.name,a=[];t.categories.forEach((function(e){a.push(e)}));var n={name:s,categories:a,immutable:!1,active:!1};e.tabs.push(n)}}));var t=JSON.stringify(e);set_storage("tabs",t)},switchtab:function(e){e!=this.active_tab&&(this.active_tab.active=!1,e.active=!0,e.categories.forEach((function(e){this.unread_messages[e]=0}),this),this.apply_filter(this.current_categories))},editmode:function(){this.editing=!this.editing,this.save_tabs()},pause:function(){this.paused=!this.paused},newtab:function(){this.tabs.push({name:"New Tab",categories:[],immutable:!1,active:!1}),this.switchtab(this.tabs[this.tabs.length-1])},renametab:function(){if(!this.active_tab.immutable){var e=this.active_tab,t=window.prompt("Type the desired tab name:",e.name);null!==t&&""!==t&&null!==e&&(e.name=t)}},deltab:function(e){e||(e=this.active_tab),e.immutable||(this.switchtab(this.tabs[0]),this.tabs.splice(this.tabs.indexOf(e),1))},movetab:function(e,t){if(e&&!e.immutable){var s=this.tabs.indexOf(e),a=s+t;this.tabs.splice(a,0,this.tabs.splice(s,1)[0])}},tab_unread_count:function(e){var t=0,s=this.unread_messages;return e.categories.find((function(e){s[e]&&(t+=s[e])})),t},tab_unread_categories:function(e){var t=!1,s=this.unread_messages;return e.categories.find((function(e){if(s[e])return t=!0,!0})),{red:t,grey:!t}},attempt_archive:function(){if(this.messages.length>this.showingnum){var e=this.messages.splice(0,20);Array.prototype.push.apply(this.archived_messages,e)}},apply_filter:function(e){this.shown_messages.splice(0),this.unshown_messages=0,this.messages.forEach((function(t){e.indexOf(t.category)>-1&&this.shown_messages.push(t)}),this),this.archived_messages.forEach((function(t){e.indexOf(t.category)>-1&&this.unshown_messages++}),this)},add_message:function(e){let t={time:e.time,category:"error",content:e.message,repeats:1};if(t.category=this.get_category(t.content),this.crushing){let e=this.messages.slice(-this.crushing);for(let s=e.length-1;s>=0;s--){let a=e[s];a.content==t.content&&(t.repeats+=a.repeats,this.messages.splice(this.messages.indexOf(a),1))}}t.content=t.content.replace(/(\b(https?):\/\/[\-A-Z0-9+&@#\/%?=~_|!:,.;]*[\-A-Z0-9+&@#\/%=~_|])/gim,'$1'),this.current_categories.length&&this.current_categories.indexOf(t.category)<0?(isNaN(this.unread_messages[t.category])&&(this.unread_messages[t.category]=0),this.unread_messages[t.category]+=1):this.current_categories.length&&this.shown_messages.push(t),t.id=++vchat_state.lastId,this.attempt_archive(),this.messages.push(t)},internal_message:function(e){let t={time:this.messages.length?this.messages.slice(-1).time+1:0,category:"vc_system",content:"[VChat Internal] "+e+""};t.id=++vchat_state.lastId,this.messages.push(t)},on_mouseup:function(e){let t=e.target;"getSelection"in window&&!1===window.getSelection().isCollapsed||t&&("INPUT"===t.tagName||"TEXTAREA"===t.tagName)||(focusMapWindow(),e.preventDefault(),e.target.click())},click_message:function(e){let t=e.target;if("A"===t.tagName){e.stopPropagation(),e.preventDefault?e.preventDefault():e.returnValue=!1;var s=t.getAttribute("href");"?"==s[0]||s.length>=8&&"byond://"==s.substring(0,8)?window.location=s:window.location="byond://?action=openLink&link="+encodeURIComponent(s)}},get_category:function(e){if(!vchat_state.ready)return void push_Topic("not_ready");let t=domparser.parseFromString(e,"text/html").querySelector("span"),s="nomatch";return t?(this.type_table.find((function(e){if(t.msMatchesSelector(e.matches))return s=e.becomes,!0})),s):s},save_chatlog:function(){var e="";this.archived_messages.concat(this.messages).forEach((function(t){e+=t.content,t.repeats>1&&(e+="(x"+t.repeats+")"),e+="
\n"})),e+="";var t=new Date,s=String(t.getHours());s.length<2&&(s="0"+s);var a=String(t.getMinutes());a.length<2&&(a="0"+a);var n=String(t.getDate());n.length<2&&(n="0"+n);var o=String(t.getMonth()+1);o.length<2&&(o="0"+o);var i="log"+(" "+String(t.getFullYear())+"-"+o+"-"+n+" ("+s+" "+a+")")+".html",r=document.createElement("a");if(void 0!==r.download)r.href="data:attachment/text,"+encodeURI(e),r.target="_blank",r.download=i,r.click();else{var c=new Blob([e],{type:"text/html;charset=utf8;"});saved=window.navigator.msSaveOrOpenBlob(c,i)}},do_latency_test:function(){send_latency_check()},blur_this:function(e){e.target.blur()}}})}function check_ping(){Date.now()-vchat_state.lastPingReceived>vchat_opts.msBeforeDropped&&(vueapp.reconnecting=!0)}function send_latency_check(){vchat_state.latency_sent||(vchat_state.latency_sent=Date.now(),vueapp.latency="?",push_Topic("ping"),setTimeout((function(){"?"==vchat_state.latency_ms&&(vchat_state.latency_ms=999)}),1e3),setTimeout((function(){vchat_state.latency_sent=0,vueapp.latency=0}),5e3))}function get_latency_check(){vchat_state.latency_sent&&(vueapp.latency=Date.now()-vchat_state.latency_sent)}function byondDecode(e){e=e.replace(/\+/g,"%20");try{e=decodeURIComponent(e)}catch(t){e=unescape(e)}return JSON.parse(e)}function putmessage(e){e=byondDecode(e),Array.isArray(e)?e.forEach((function(e){vueapp.add_message(e)})):"object"==typeof e&&vueapp.add_message(e)}function system_message(e){vueapp.internal_message(e)}function push_Topic(e){window.location="?_src_=chat&proc="+e}function push_Topic_showingnum(e){window.location="?_src_=chat&showingnum="+e}function focusMapWindow(){window.location="byond://winset?mapwindow.map.focus=true"}function send_debug(e){push_Topic("debug¶m[message]="+encodeURIComponent(e))}function get_event(e){if(vchat_state.ready){var t;switch((t=byondDecode(e)).evttype){case"internal_error":system_message("Event parse error: "+e);break;case"byond_player":send_client_data(),vueapp.is_admin="true"===t.admin,vchat_state.byond_ip=t.address,vchat_state.byond_cid=t.cid,vchat_state.byond_ckey=t.ckey,set_storage("ip",vchat_state.byond_ip),set_storage("cid",vchat_state.byond_cid),set_storage("ckey",vchat_state.byond_ckey);break;case"keepalive":vchat_state.lastPingReceived=Date.now(),vueapp.reconnecting=!1;break;case"pong":get_latency_check();break;case"availability":push_Topic("done_loading");break;default:system_message("Didn't know what to do with event: "+e)}}else push_Topic("not_ready")}function send_client_data(){let e={ip:get_storage("ip"),cid:get_storage("cid"),ckey:get_storage("ckey")};push_Topic("ident¶m[clientdata]="+JSON.stringify(e))}function set_localstorage(e,t){window.localStorage.setItem(vchat_opts.cookiePrefix+e,t)}function get_localstorage(e,t){let s=window.localStorage.getItem(vchat_opts.cookiePrefix+e);return"null"===s||null===s?s=t:"true"===s?s=!0:"false"===s?s=!1:isNaN(s)||(s=+s),s}function set_cookie(e,t){let s=new Date;s.setFullYear(s.getFullYear()+1);let a=s.toUTCString();document.cookie=vchat_opts.cookiePrefix+e+"="+t+";expires="+a+";path=/"}function get_cookie(e,t){let s=document.cookie.split(";"),a={};s.forEach((function(e){let s=e.replace(vchat_opts.cookiePrefix,"").trim(),n=s.search("="),o=decodeURIComponent(s.substring(0,n)),i=decodeURIComponent(s.substring(n+1));"null"==i||null===i?i=t:"true"===i?i=!0:"false"===i?i=!1:isNaN(i)||(i=+i),a[o]=i})),a[e]}var SKIN_BUTTONS=["rpane.textb","rpane.infob","rpane.wikib","rpane.forumb","rpane.rulesb","rpane.github","rpane.discord","rpane.mapb","rpane.changelog","mainwindow.saybutton","mainwindow.mebutton","mainwindow.hotkey_toggle"],SKIN_ELEMENTS=["mainwindow","mainwindow.mainvsplit","mainwindow.tooltip","rpane","rpane.rpanewindow","rpane.mediapanel"];function switch_ui_mode(e){doWinset(SKIN_BUTTONS.reduce((function(t,s){return t[s+".background-color"]=e.buttonBgColor,t}),{})),doWinset(SKIN_BUTTONS.reduce((function(t,s){return t[s+".text-color"]=e.buttonTextColor,t}),{})),doWinset(SKIN_ELEMENTS.reduce((function(t,s){return t[s+".background-color"]=e.windowBgColor,t}),{})),doWinset("infowindow",{"background-color":e.tabBackgroundColor,"text-color":e.tabTextColor}),doWinset("infowindow.info",{"background-color":e.tabBackgroundColor,"text-color":e.tabTextColor,"highlight-color":e.highlightColor,"tab-text-color":e.tabTextColor,"tab-background-color":e.tabBackgroundColor})}function doWinset(e,t){void 0===t&&(t=e,e=null);var s="byond://winset?";e&&(s+="id="+e+"&"),s+=Object.keys(t).map((function(e){return e+"="+encodeURIComponent(t[e])})).join("&"),window.location=s} +!function(){var e=console.log;console.log=function(t){send_debug(t),e.apply(console,arguments)};var t=console.error;console.error=function(e){send_debug(e),t.apply(console,arguments)},window.onerror=function(e,t,s,a,n){var o="";return n&&n.stack&&(o=n.stack),send_debug(e+" ("+t+"@"+s+":"+a+") "+n+"|UA: "+navigator.userAgent+"|Stack: "+o),!0}}();var vchat_opts={msBeforeDropped:3e4,cookiePrefix:"vst-",alwaysShow:["vc_looc","vc_system"],vchatTabsVer:1},DARKMODE_COLORS={buttonBgColor:"#40628a",buttonTextColor:"#FFFFFF",windowBgColor:"#272727",highlightColor:"#009900",tabTextColor:"#FFFFFF",tabBackgroundColor:"#272727"},LIGHTMODE_COLORS={buttonBgColor:"none",buttonTextColor:"#000000",windowBgColor:"none",highlightColor:"#007700",tabTextColor:"#000000",tabBackgroundColor:"none"},set_storage=set_cookie,get_storage=get_cookie,domparser=new DOMParser;storageAvailable("localStorage")&&(set_storage=set_localstorage,get_storage=get_localstorage);var vueapp,vchat_state={ready:!1,byond_ip:null,byond_cid:null,byond_ckey:null,lastPingReceived:0,latency_sent:0,lastId:0};function start_vchat(){start_vue(),vchat_state.ready=!0,push_Topic("done_loading"),push_Topic_showingnum(this.showingnum),doWinset("htmloutput",{"is-visible":!0}),doWinset("oldoutput",{"is-visible":!1}),doWinset("chatloadlabel",{"is-visible":!1}),setInterval(check_ping,vchat_opts.msBeforeDropped),send_debug("VChat Loaded!")}function start_vue(){vueapp=new Vue({el:"#app",data:{messages:[],shown_messages:[],unshown_messages:0,archived_messages:[],tabs:[{name:"Main",categories:[],immutable:!0,active:!0}],unread_messages:{},editing:!1,paused:!1,latency:0,reconnecting:!1,ext_styles:"",is_admin:!1,inverted:!1,crushing:3,animated:!1,fontsize:.9,lineheight:130,showingnum:200,type_table:[{matches:".filter_say, .say, .emote, .emote_subtle",becomes:"vc_localchat",pretty:"Local Chat",tooltip:"In-character local messages (say, emote, etc)",required:!1,admin:!1},{matches:".filter_radio, .alert, .syndradio, .centradio, .airadio, .entradio, .comradio, .secradio, .engradio, .medradio, .sciradio, .supradio, .srvradio, .expradio, .radio, .deptradio, .newscaster",becomes:"vc_radio",pretty:"Radio Comms",tooltip:"All departments of radio messages",required:!1,admin:!1},{matches:".filter_notice, .notice:not(.pm), .adminnotice, .info, .sinister, .cult",becomes:"vc_info",pretty:"Notices",tooltip:"Non-urgent messages from the game and items",required:!1,admin:!1},{matches:".filter_warning, .warning:not(.pm), .critical, .userdanger, .italics",becomes:"vc_warnings",pretty:"Warnings",tooltip:"Urgent messages from the game and items",required:!1,admin:!1},{matches:".filter_deadsay, .deadsay",becomes:"vc_deadchat",pretty:"Deadchat",tooltip:"All of deadchat",required:!1,admin:!1},{matches:".filter_ooc, .ooc:not(.looc)",becomes:"vc_globalooc",pretty:"Global OOC",tooltip:"The bluewall of global OOC messages",required:!1,admin:!1},{matches:".nif",becomes:"vc_nif",pretty:"NIF Messages",tooltip:"Messages from the NIF itself and people inside",required:!1,admin:!1},{matches:".mentor_channel, .mentor",becomes:"vc_mentor",pretty:"Mentor messages",tooltip:"Mentorchat and mentor pms",required:!1,admin:!1},{matches:".filter_pm, .pm",becomes:"vc_adminpm",pretty:"Admin PMs",tooltip:"Messages to/from admins ('adminhelps')",required:!1,admin:!1},{matches:".filter_ASAY, .admin_channel",becomes:"vc_adminchat",pretty:"Admin Chat",tooltip:"ASAY messages",required:!1,admin:!0},{matches:".filter_MSAY, .mod_channel",becomes:"vc_modchat",pretty:"Mod Chat",tooltip:"MSAY messages",required:!1,admin:!0},{matches:".filter_ESAY, .event_channel",becomes:"vc_eventchat",pretty:"Event Chat",tooltip:"ESAY messages",required:!1,admin:!0},{matches:".filter_combat, .danger",becomes:"vc_combat",pretty:"Combat Logs",tooltip:"Urist McTraitor has stabbed you with a knife!",required:!1,admin:!1},{matches:".filter_adminlogs, .log_message",becomes:"vc_adminlogs",pretty:"Admin Logs",tooltip:"ADMIN LOG: Urist McAdmin has jumped to coordinates X, Y, Z",required:!1,admin:!0},{matches:".filter_attacklogs",becomes:"vc_attacklogs",pretty:"Attack Logs",tooltip:"Urist McTraitor has shot John Doe",required:!1,admin:!0},{matches:".filter_debuglogs",becomes:"vc_debuglogs",pretty:"Debug Logs",tooltip:"DEBUG: SSPlanets subsystem Recover().",required:!1,admin:!0},{matches:".ooc.looc, .ooc, .looc",becomes:"vc_looc",pretty:"Local OOC",tooltip:"Local OOC messages, always enabled",required:!0},{matches:".boldannounce, .filter_system",becomes:"vc_system",pretty:"System Messages",tooltip:"Messages from your client, always enabled",required:!0},{matches:".unsorted",becomes:"vc_unsorted",pretty:"Unsorted",tooltip:"Messages that don't have any filters.",required:!1,admin:!1}]},mounted:function(){this.load_settings();var e=new XMLHttpRequest;e.open("GET","ss13styles.css"),e.onreadystatechange=function(){this.ext_styles=e.responseText}.bind(this),e.send()},updated:function(){this.editing||this.paused||window.scrollTo(0,document.getElementById("messagebox").scrollHeight)},watch:{reconnecting:function(e,t){1==e&&0==t?this.internal_message("Your client has lost connection to the server, or there is severe lag. Your client will reconnect if possible."):0==e&&1==t&&this.internal_message("Your client has reconnected to the server.")},inverted:function(e){set_storage("darkmode",e),e?(document.body.classList.add("inverted"),switch_ui_mode(DARKMODE_COLORS)):(document.body.classList.remove("inverted"),switch_ui_mode(LIGHTMODE_COLORS))},crushing:function(e){set_storage("crushing",e)},animated:function(e){set_storage("animated",e)},fontsize:function(e,t){isNaN(e)?this.fontsize=t:(e<.2?this.fontsize=.2:e>5&&(this.fontsize=5),set_storage("fontsize",e))},lineheight:function(e,t){isFinite(e)?(e<100?this.lineheight=100:e>200&&(this.lineheight=200),set_storage("lineheight",e)):this.lineheight=t},showingnum:function(e,t){isFinite(e)?((e=Math.floor(e))<50?this.showingnum=50:e>2e3&&(this.showingnum=2e3),set_storage("showingnum",this.showingnum),push_Topic_showingnum(this.showingnum),this.attempt_archive()):this.showingnum=t},current_categories:function(e,t){e.length&&this.apply_filter(e)}},computed:{active_tab:function(){return this.tabs.find((function(e){return e.active}))},ping_classes:function(){return this.latency?"?"==this.latency?"grey":this.latency<0?"red":this.latency<=200?"green":this.latency<=400?"yellow":"grey":this.reconnecting?"red":"green"},current_categories:function(){return this.active_tab==this.tabs[0]?[]:this.active_tab.categories.concat(vchat_opts.alwaysShow)}},methods:{load_settings:function(){this.inverted=get_storage("darkmode",!1),this.crushing=get_storage("crushing",3),this.animated=get_storage("animated",!1),this.fontsize=get_storage("fontsize",.9),this.lineheight=get_storage("lineheight",130),this.showingnum=get_storage("showingnum",200),isNaN(this.crushing)&&(this.crushing=3),isNaN(this.fontsize)&&(this.fontsize=.9),this.load_tabs()},load_tabs:function(){var e=get_storage("tabs");if(e){var t=JSON.parse(e);t.version&&t.tabs?!t.version!=vchat_opts.vchatTabsVer?this.tabs.push.apply(this.tabs,t.tabs):this.internal_message("Your saved tabs are for an older version of VChat and must be recreated, sorry."):this.internal_message("There was a problem loading your tabs. Any new ones you make will be saved, however.")}},save_tabs:function(){var e={version:vchat_opts.vchatTabsVer,tabs:[]};this.tabs.forEach((function(t){if(!t.immutable){var s=t.name,a=[];t.categories.forEach((function(e){a.push(e)}));var n={name:s,categories:a,immutable:!1,active:!1};e.tabs.push(n)}}));var t=JSON.stringify(e);set_storage("tabs",t)},switchtab:function(e){e!=this.active_tab&&(this.active_tab.active=!1,e.active=!0,e.categories.forEach((function(e){this.unread_messages[e]=0}),this),this.apply_filter(this.current_categories))},editmode:function(){this.editing=!this.editing,this.save_tabs()},pause:function(){this.paused=!this.paused},newtab:function(){this.tabs.push({name:"New Tab",categories:[],immutable:!1,active:!1}),this.switchtab(this.tabs[this.tabs.length-1])},renametab:function(){if(!this.active_tab.immutable){var e=this.active_tab,t=window.prompt("Type the desired tab name:",e.name);null!==t&&""!==t&&null!==e&&(e.name=t)}},deltab:function(e){e||(e=this.active_tab),e.immutable||(this.switchtab(this.tabs[0]),this.tabs.splice(this.tabs.indexOf(e),1))},movetab:function(e,t){if(e&&!e.immutable){var s=this.tabs.indexOf(e),a=s+t;this.tabs.splice(a,0,this.tabs.splice(s,1)[0])}},tab_unread_count:function(e){var t=0,s=this.unread_messages;return e.categories.find((function(e){s[e]&&(t+=s[e])})),t},tab_unread_categories:function(e){var t=!1,s=this.unread_messages;return e.categories.find((function(e){if(s[e])return t=!0,!0})),{red:t,grey:!t}},attempt_archive:function(){if(this.messages.length>this.showingnum){var e=this.messages.splice(0,20);Array.prototype.push.apply(this.archived_messages,e)}},apply_filter:function(e){this.shown_messages.splice(0),this.unshown_messages=0,this.messages.forEach((function(t){e.indexOf(t.category)>-1&&this.shown_messages.push(t)}),this),this.archived_messages.forEach((function(t){e.indexOf(t.category)>-1&&this.unshown_messages++}),this)},add_message:function(e){let t={time:e.time,category:"error",content:e.message,repeats:1};if(t.category=this.get_category(t.content),"vc_unsorted"==t.category&&(t.content=""+t.content+""),this.crushing){let e=this.messages.slice(-this.crushing);for(let s=e.length-1;s>=0;s--){let a=e[s];a.content==t.content&&(t.repeats+=a.repeats,this.messages.splice(this.messages.indexOf(a),1))}}t.content=t.content.replace(/(\b(https?):\/\/[\-A-Z0-9+&@#\/%?=~_|!:,.;]*[\-A-Z0-9+&@#\/%=~_|])/gim,'$1'),this.current_categories.length&&this.current_categories.indexOf(t.category)<0?(isNaN(this.unread_messages[t.category])&&(this.unread_messages[t.category]=0),this.unread_messages[t.category]+=1):this.current_categories.length&&this.shown_messages.push(t),t.id=++vchat_state.lastId,this.attempt_archive(),this.messages.push(t)},internal_message:function(e){let t={time:this.messages.length?this.messages.slice(-1).time+1:0,category:"vc_system",content:"[VChat Internal] "+e+""};t.id=++vchat_state.lastId,this.messages.push(t)},on_mouseup:function(e){let t=e.target;"getSelection"in window&&!1===window.getSelection().isCollapsed||t&&("INPUT"===t.tagName||"TEXTAREA"===t.tagName)||(focusMapWindow(),e.preventDefault(),e.target.click())},click_message:function(e){let t=e.target;if("A"===t.tagName){e.stopPropagation(),e.preventDefault?e.preventDefault():e.returnValue=!1;var s=t.getAttribute("href");"?"==s[0]||s.length>=8&&"byond://"==s.substring(0,8)?window.location=s:window.location="byond://?action=openLink&link="+encodeURIComponent(s)}},get_category:function(e){if(!vchat_state.ready)return void push_Topic("not_ready");let t=domparser.parseFromString(e,"text/html").querySelector("span"),s="vc_unsorted";return t?(this.type_table.find((function(e){if(t.msMatchesSelector(e.matches))return s=e.becomes,!0})),s):s},save_chatlog:function(){var e="",t=this.archived_messages.concat(this.messages),s=this.current_categories;t.forEach((function(t){(0==s.length||s.indexOf(t.category)>=0)&&(e+=t.content,t.repeats>1&&(e+="(x"+t.repeats+")"),e+="
\n")})),e+="";var a=new Date,n=String(a.getHours());n.length<2&&(n="0"+n);var o=String(a.getMinutes());o.length<2&&(o="0"+o);var i=String(a.getDate());i.length<2&&(i="0"+i);var r=String(a.getMonth()+1);r.length<2&&(r="0"+r);var c="log"+(" "+String(a.getFullYear())+"-"+r+"-"+i+" ("+n+" "+o+")")+".html",l=document.createElement("a");if(void 0!==l.download)l.href="data:attachment/text,"+encodeURI(e),l.target="_blank",l.download=c,l.click();else{var h=new Blob([e],{type:"text/html;charset=utf8;"});saved=window.navigator.msSaveOrOpenBlob(h,c)}},do_latency_test:function(){send_latency_check()},blur_this:function(e){e.target.blur()}}})}function check_ping(){Date.now()-vchat_state.lastPingReceived>vchat_opts.msBeforeDropped&&(vueapp.reconnecting=!0)}function send_latency_check(){vchat_state.latency_sent||(vchat_state.latency_sent=Date.now(),vueapp.latency="?",push_Topic("ping"),setTimeout((function(){"?"==vchat_state.latency_ms&&(vchat_state.latency_ms=999)}),1e3),setTimeout((function(){vchat_state.latency_sent=0,vueapp.latency=0}),5e3))}function get_latency_check(){vchat_state.latency_sent&&(vueapp.latency=Date.now()-vchat_state.latency_sent)}function byondDecode(e){e=e.replace(/\+/g,"%20");try{e=decodeURIComponent(e)}catch(t){e=unescape(e)}return JSON.parse(e)}function putmessage(e){e=byondDecode(e),Array.isArray(e)?e.forEach((function(e){vueapp.add_message(e)})):"object"==typeof e&&vueapp.add_message(e)}function system_message(e){vueapp.internal_message(e)}function push_Topic(e){window.location="?_src_=chat&proc="+e}function push_Topic_showingnum(e){window.location="?_src_=chat&showingnum="+e}function focusMapWindow(){window.location="byond://winset?mapwindow.map.focus=true"}function send_debug(e){push_Topic("debug¶m[message]="+encodeURIComponent(e))}function get_event(e){if(vchat_state.ready){var t;switch((t=byondDecode(e)).evttype){case"internal_error":system_message("Event parse error: "+e);break;case"byond_player":send_client_data(),vueapp.is_admin="true"===t.admin,vchat_state.byond_ip=t.address,vchat_state.byond_cid=t.cid,vchat_state.byond_ckey=t.ckey,set_storage("ip",vchat_state.byond_ip),set_storage("cid",vchat_state.byond_cid),set_storage("ckey",vchat_state.byond_ckey);break;case"keepalive":vchat_state.lastPingReceived=Date.now(),vueapp.reconnecting=!1;break;case"pong":get_latency_check();break;case"availability":push_Topic("done_loading");break;default:system_message("Didn't know what to do with event: "+e)}}else push_Topic("not_ready")}function send_client_data(){let e={ip:get_storage("ip"),cid:get_storage("cid"),ckey:get_storage("ckey")};push_Topic("ident¶m[clientdata]="+JSON.stringify(e))}function set_localstorage(e,t){window.localStorage.setItem(vchat_opts.cookiePrefix+e,t)}function get_localstorage(e,t){let s=window.localStorage.getItem(vchat_opts.cookiePrefix+e);return"null"===s||null===s?s=t:"true"===s?s=!0:"false"===s?s=!1:isNaN(s)||(s=+s),s}function set_cookie(e,t){let s=new Date;s.setFullYear(s.getFullYear()+1);let a=s.toUTCString();document.cookie=vchat_opts.cookiePrefix+e+"="+t+";expires="+a+";path=/"}function get_cookie(e,t){let s=document.cookie.split(";"),a={};s.forEach((function(e){let s=e.replace(vchat_opts.cookiePrefix,"").trim(),n=s.search("="),o=decodeURIComponent(s.substring(0,n)),i=decodeURIComponent(s.substring(n+1));"null"==i||null===i?i=t:"true"===i?i=!0:"false"===i?i=!1:isNaN(i)||(i=+i),a[o]=i})),a[e]}var SKIN_BUTTONS=["rpane.textb","rpane.infob","rpane.wikib","rpane.forumb","rpane.rulesb","rpane.github","rpane.discord","rpane.mapb","rpane.changelog","mainwindow.saybutton","mainwindow.mebutton","mainwindow.hotkey_toggle"],SKIN_ELEMENTS=["mainwindow","mainwindow.mainvsplit","mainwindow.tooltip","rpane","rpane.rpanewindow","rpane.mediapanel"];function switch_ui_mode(e){doWinset(SKIN_BUTTONS.reduce((function(t,s){return t[s+".background-color"]=e.buttonBgColor,t}),{})),doWinset(SKIN_BUTTONS.reduce((function(t,s){return t[s+".text-color"]=e.buttonTextColor,t}),{})),doWinset(SKIN_ELEMENTS.reduce((function(t,s){return t[s+".background-color"]=e.windowBgColor,t}),{})),doWinset("infowindow",{"background-color":e.tabBackgroundColor,"text-color":e.tabTextColor}),doWinset("infowindow.info",{"background-color":e.tabBackgroundColor,"text-color":e.tabTextColor,"highlight-color":e.highlightColor,"tab-text-color":e.tabTextColor,"tab-background-color":e.tabBackgroundColor})}function doWinset(e,t){void 0===t&&(t=e,e=null);var s="byond://winset?";e&&(s+="id="+e+"&"),s+=Object.keys(t).map((function(e){return e+"="+encodeURIComponent(t[e])})).join("&"),window.location=s} \ No newline at end of file diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index 7a8511c898..c0b7dbbfcf 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -236,9 +236,9 @@ tmob_message = tail.msg_owner_stepunder if(src_message) - to_chat(src, STEP_TEXT_OWNER(src_message)) + to_chat(src, "[STEP_TEXT_OWNER(src_message)]") if(tmob_message) - to_chat(tmob, STEP_TEXT_PREY(tmob_message)) + to_chat(tmob, "[STEP_TEXT_PREY(tmob_message)]") return TRUE return FALSE @@ -398,7 +398,7 @@ set category = "IC" pickup_active = !pickup_active - to_chat(src, "You will [pickup_active ? "now" : "no longer"] attempt to pick up mobs when clicking them with help intent.") + to_chat(src, "You will [pickup_active ? "now" : "no longer"] attempt to pick up mobs when clicking them with help intent.") #undef STEP_TEXT_OWNER #undef STEP_TEXT_PREY diff --git a/code/modules/xenoarcheaology/artifacts/replicator.dm b/code/modules/xenoarcheaology/artifacts/replicator.dm index fd138f8ec6..06c411fab9 100644 --- a/code/modules/xenoarcheaology/artifacts/replicator.dm +++ b/code/modules/xenoarcheaology/artifacts/replicator.dm @@ -91,7 +91,6 @@ var/type = pick(viables) viables.Remove(type) construction[button_desc] = type -<<<<<<< HEAD tgui_construction.Add(list(list( "key" = button_desc, "background" = background, @@ -99,11 +98,7 @@ "foreground" = colors[color], ))) - fail_message = "\icon[src][bicon(src)] a [pick("loud","soft","sinister","eery","triumphant","depressing","cheerful","angry")] \ -======= - - fail_message = "[bicon(src)] a [pick("loud","soft","sinister","eery","triumphant","depressing","cheerful","angry")] \ ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) + fail_message = "\icon[src][bicon(src)] a [pick("loud","soft","sinister","eery","triumphant","depressing","cheerful","angry")] \ [pick("horn","beep","bing","bleep","blat","honk","hrumph","ding")] sounds and a \ [pick("yellow","purple","green","blue","red","orange","white")] \ [pick("light","dial","meter","window","protrusion","knob","antenna","swirly thing")] \ @@ -183,4 +178,4 @@ user.drop_item() W.loc = src stored_materials.Add(W) - src.visible_message("\The [user] inserts \the [W] into \the [src].") + src.visible_message("\The [user] inserts \the [W] into \the [src].") diff --git a/code/modules/xenoarcheaology/artifacts/replicator_vr.dm b/code/modules/xenoarcheaology/artifacts/replicator_vr.dm index 43580ad72b..017b926de9 100644 --- a/code/modules/xenoarcheaology/artifacts/replicator_vr.dm +++ b/code/modules/xenoarcheaology/artifacts/replicator_vr.dm @@ -275,7 +275,7 @@ inserted_human.drop_from_inventory(I) inserted_mob.loc = src stored_materials.Add(inserted_mob) - src.visible_message("\The [user] inserts \the [inserted_mob] into \the [src].") + src.visible_message("\The [user] inserts \the [inserted_mob] into \the [src].") return else to_chat(user, "You cannot put \the [W] into the machine. ((The micro must be connected to the server.))") @@ -296,7 +296,7 @@ //Now that we've dropped all the items they have, let's shove them back into the micro holder. W.loc = src stored_materials.Add(W) - src.visible_message("\The [user] inserts \the [W] into \the [src].") + src.visible_message("\The [user] inserts \the [W] into \the [src].") /obj/machinery/replicator/vore/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = ..() @@ -543,7 +543,7 @@ inserted_human.drop_from_inventory(I) inserted_mob.loc = src stored_materials.Add(inserted_mob) - src.visible_message("\The [user] inserts \the [inserted_mob] into \the [src].") + src.visible_message("\The [user] inserts \the [inserted_mob] into \the [src].") return else to_chat(user, "You cannot put \the [W] into the machine. ((They must be connected to the server.))") @@ -562,7 +562,7 @@ //Now that we've dropped all the items they have, let's shove them back into the micro holder. W.loc = src stored_materials.Add(W) - src.visible_message("\The [user] inserts \the [W] into \the [src].") + src.visible_message("\The [user] inserts \the [W] into \the [src].") /obj/machinery/replicator/clothing/tgui_interact(mob/user, datum/tgui/ui) //This creates the menu. diff --git a/code/modules/xenoarcheaology/effect.dm b/code/modules/xenoarcheaology/effect.dm index 5854dc8445..bccb9faa0e 100644 --- a/code/modules/xenoarcheaology/effect.dm +++ b/code/modules/xenoarcheaology/effect.dm @@ -81,25 +81,7 @@ if(activated) display_msg = pick("momentarily glows brightly!","distorts slightly for a moment!","flickers slightly!","vibrates!","shimmers slightly for a moment!") else -<<<<<<< HEAD display_msg = pick("grows dull!","fades in intensity!","suddenly becomes very still!","suddenly becomes very quiet!") -======= - target.underlays.Remove(active_effect) - var/atom/toplevelholder = target - while (!istype(toplevelholder.loc, /turf)) - toplevelholder = toplevelholder.loc - toplevelholder.visible_message("[bicon(toplevelholder)] [toplevelholder] [display_msg]") - return TRUE - - -/datum/artifact_effect/proc/DoEffectTouch(mob/living/user) - return - - -/datum/artifact_effect/proc/DoEffectAura() - return - ->>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006) if(active_effect) if(activated) @@ -110,7 +92,7 @@ var/atom/toplevelholder = target while(!istype(toplevelholder.loc, /turf)) toplevelholder = toplevelholder.loc - toplevelholder.visible_message("\icon[toplevelholder][bicon(toplevelholder)] [toplevelholder] [display_msg]") + toplevelholder.visible_message("\icon[toplevelholder][bicon(toplevelholder)] [toplevelholder] [display_msg]") /datum/artifact_effect/proc/DoEffectTouch(var/mob/user) /datum/artifact_effect/proc/DoEffectAura(var/atom/holder)