cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-15 00:54:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict fixes for chat filters PR

Browse Source
This commit is contained in:
Seris02
2023-03-09 17:19:02 +08:00
parent dd1e58acc7
commit 0cdc45eddf
40 changed files with 128 additions and 629 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job_controller.dm
-5
View File
@@ -538,13 +538,8 @@ var/global/datum/controller/occupations/job_master
if(job.supervisors)
to_chat(H, "<span class='filter_notice'><b>As the [alt_title ? alt_title : rank] you answer directly to [job.supervisors]. Special circumstances may change this.</b></span>")
if(job.has_headset)
<<<<<<< HEAD
H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_l_ear)
to_chat(H, "<b>To speak on your department's radio channel use :h. For the use of other channels, examine your headset.</b>")
=======
H.equip_to_slot_or_del(new /obj/item/radio/headset(H), slot_l_ear)
to_chat(H, "<span class='filter_notice'><b>To speak on your department's radio channel use :h. For the use of other channels, examine your headset.</b></span>")
>>>>>>> 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, "<span class='filter_notice'><b>You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp.</b></span>")
code/game/machinery/telecomms/broadcaster.dm
+6 -30
View File
@@ -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 = " <i>(Intercepted)</i>"
<<<<<<< HEAD
var/part_a = "<span class='[frequency_span_class(display_freq)]'>\icon[radio][bicon(radio)]<b>\[[freq_text]\][part_b_extra]</b> <span class='name'>" // goes in the actual output
=======
var/part_a = "<span class='[frequency_span_class(display_freq)]'>"
var/part_b = "[bicon(radio)]<b>\[[freq_text]\][part_b_extra]</b> <span class='name'>" // 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)]<b>\[[freq_text]\][part_b_extra]</b> <span class='name'>" // goes in the actual output
// --- Some more pre-message formatting ---
var/part_c = "</span> <span class='message'>" // 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
code/modules/client/verbs/advanced_who.dm
-5
View File
@@ -93,10 +93,5 @@
msg += "[line]"
msg += "</table>"
msg += "<b>Total Players: [length(Lines)]</b>"
<<<<<<< HEAD
msg = "<span class='filter_info'>" + msg + "</span>"
to_chat(src, msg)
=======
msg = "<span class='filter_notice'>" + msg + "</span>"
to_chat(src, msg)
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
code/modules/client/verbs/who.dm
-4
View File
@@ -122,7 +122,6 @@
if(config.show_event_managers)
msg += "\n<b> Current Miscellaneous ([num_event_managers_online]):</b>\n" + eventMmsg
<<<<<<< HEAD
var/num_mentors_online = 0
var/mmsg = ""
@@ -147,7 +146,4 @@
msg += "\n<span class='info'>Adminhelps are also sent to Discord. If no admins are available in game try anyway and an admin on Discord may see it and respond.</span>"
to_chat(src, msg)
=======
to_chat(src,"<span class='filter_notice'>[jointext(msg, "<br>")]</span>")
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
code/modules/food/kitchen/cooking_machines/_cooker.dm
+1 -6
View File
@@ -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, "<span class='filter_notice'>\The [I] will be used to make a [selected_option]. Output selection is returned to default for future items.</span>")
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
selected_option = null
code/modules/food/kitchen/cooking_machines/_mixer.dm
+4 -9
View File
@@ -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("<span class='filter_notice'>[usr] turns the [src] off.</span>", "<span class='filter_notice'>You turn off \the [src].</span>")
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)
code/modules/food/kitchen/cooking_machines/grill.dm
-78
View File
@@ -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("<span class='filter_notice'>[usr] turns \the [src] on.</span>", "<span class='filter_notice'>You turn on \the [src].</span>")
get_cooking_work(CI)
use_power = 2
else //It's on, turn it off
stat |= POWEROFF
use_power = 0
if (usr)
usr.visible_message("<span class='filter_notice'>[usr] turns \the [src] off.</span>", "<span class='filter_notice'>You turn off \the [src].</span>")
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, "<span class='filter_notice'>There's nothing in the [src] you can remove!</span>")
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)
code/modules/hydroponics/grown.dm
+6 -34
View File
@@ -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, "<span class='filter_notice'>You add the newly-formed wood to the stack. It now contains [NG.amount] planks.</span>")
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
to_chat(user, "<span class='filter_notice'>You add the newly-formed wood to the stack. It now contains [NG.get_amount()] planks.</span>")
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, "<span class='filter_notice'>You slice \the [src] into sticks.</span>")
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, "<span class='filter_notice'>You slice \the [src] into sticks.</span>")
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, "<span class='filter_notice'>You slice \the [src] into rings.</span>")
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, "<span class='filter_notice'>You roughly chop up \the [src].</span>")
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, "<span class='filter_notice'>You add the newly-formed grass to the stack. It now contains [G.amount] tiles.</span>")
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
to_chat(user, "<span class='filter_notice'>You add the newly-formed carpet to the stack. It now contains [G.get_amount()] tiles.</span>")
qdel(src)
return
code/modules/hydroponics/seed_machines.dm
+3 -52
View File
@@ -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("<span class='filter_notice'>\icon[src][bicon(src)] [src] pings unhappily, flashing a red warning light.</span>")
else
visible_message("\icon[src][bicon(src)] [src] pings happily.")
=======
visible_message("<span class='filter_notice'>[bicon(src)] [src] pings unhappily, flashing a red warning light.</span>")
else
visible_message("<span class='filter_notice'>[bicon(src)] [src] pings happily.</span>")
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
visible_message("<span class='filter_notice'>\icon[src][bicon(src)] [src] pings happily.</span>")
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("<span class='filter_notice'>[bicon(src)] [src] beeps and spits out [loaded_disk].</span>")
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
visible_message("<span class='filter_notice'>\icon[src][bicon(src)] [src] beeps and spits out [loaded_disk].</span>")
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("<span class='filter_notice'>[bicon(src)] [src] beeps and spits out [seed].</span>")
seed = null
if(href_list["eject_disk"])
if(!loaded_disk) return
loaded_disk.loc = get_turf(src)
visible_message("<span class='filter_notice'>[bicon(src)] [src] beeps and spits out [loaded_disk].</span>")
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(..())
code/modules/hydroponics/trays/tray_tools.dm
-14
View File
@@ -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, "<span class='filter_notice'>There is no scan data to print.</span>")
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("<span class='filter_notice'>\The [src] spits out a piece of paper.</span>")
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))
code/modules/mob/dead/observer/observer.dm
+1 -5
View File
@@ -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, "<span class='filter_notice'>You [seedarkness ? "now" : "no longer"] see darkness.</span>")
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
to_chat(src, "<span class='filter_notice'>Your vision now has [darkness_names[index]].</span>")
/mob/observer/dead/proc/updateghostsight()
plane_holder.set_desired_alpha(VIS_LIGHTING, lighting_alpha)
code/modules/mob/dead/observer/observer_vr.dm
+4 -4
View File
@@ -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, "<span class='filter_notice'>No active ghost pods detected.</span>")
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, "<span class='filter_notice'>This ghost pod is not located in the game world.</span>")
/mob/observer/dead/verb/findautoresleever()
set category = "Ghost"
@@ -156,5 +156,5 @@
if(!L)
to_chat(src, "<span class='warning'>There appears to be something wrong with this auto-resleever, try again.</span>")
return
forceMove(L)
code/modules/mob/hear_say.dm
+3 -46
View File
@@ -140,21 +140,13 @@
/mob/proc/on_hear_say(var/message)
to_chat(src, "<span class='game say'>[message]</span>")
if(teleop)
<<<<<<< HEAD
to_chat(teleop, create_text_tag("body", "BODY:", teleop.client) + "[message]")
=======
to_chat(teleop, "<span class='game say'>[create_text_tag("body", "BODY:", teleop.client)][message]</span>")
>>>>>>> 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, "<span class='game say'>[time] [message]</span>")
if(teleop)
<<<<<<< HEAD
to_chat(teleop, create_text_tag("body", "BODY:", teleop.client) + "[time] [message]")
=======
to_chat(teleop, "<span class='game say'>[create_text_tag("body", "BODY:", teleop.client)][time] [message]</span>")
>>>>>>> 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, "<span class='warning'>You feel your headset vibrate but can hear nothing from it!</span>")
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 "<span class='say_quote'>\[[stationtime2text()]\]</span>"
<<<<<<< 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]<font size='3'><b>[final_message]</b></font>[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]<font size='3'><b>[final_message]</b></font>[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]<font size='3'><b>[final_message]</b></font>[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]<font size='3'><b>[final_message]</b></font>[part_e]"
else
@@ -274,13 +240,8 @@
return
if(say_understands(speaker, language))
<<<<<<< HEAD
message = "<B>[speaker]</B> [verb_understood], \"[message]\""
message = "<span class='game say'><B>[speaker]</B> [verb_understood], \"[message]\"</span>"
else if(!(language.ignore_adverb))
=======
message = "<span class='game say'><B>[speaker]</B> [verb], \"[message]\"</span>"
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 = "<B>[speaker]</B> [verb][adverb]."
else
message = "<B>[speaker]</B> [verb]."
=======
message = "<span class='game say'><B>[speaker]</B> [verb][adverb].</span>"
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
else
message = "<span class='game say'><B>[speaker]</B> [verb].</span>"
show_message(message, type = speech_type) // Type 1 is visual message
code/modules/mob/living/carbon/human/emote_vr.dm
+2 -2
View File
@@ -60,7 +60,7 @@
message = "reveals their wings!"
else
message = "hides their wings."
visible_message("[src] [message]")
visible_message("<span class='filter_notice'>[src] [message]</span>")
/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]")
visible_message("<span class='filter_notice'>[src] [message]</span>")
code/modules/mob/living/carbon/human/human.dm
+20 -47
View File
@@ -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, "<b>Name:</b> [R.fields["name"]] <b>Criminal Status:</b> [R.fields["criminal"]]")
to_chat(usr, "<b>Species:</b> [R.fields["species"]]")
to_chat(usr, "<b>Minor Crimes:</b> [R.fields["mi_crim"]]")
to_chat(usr, "<b>Details:</b> [R.fields["mi_crim_d"]]")
to_chat(usr, "<b>Major Crimes:</b> [R.fields["ma_crim"]]")
to_chat(usr, "<b>Details:</b> [R.fields["ma_crim_d"]]")
to_chat(usr, "<b>Notes:</b> [R.fields["notes"]]")
to_chat(usr, "<a href='?src=\ref[src];secrecordComment=`'>\[View Comment Log\]</a>")
=======
var/list/security_hud_text = list()
security_hud_text += "<b>Name:</b> [R.fields["name"]] <b>Criminal Status:</b> [R.fields["criminal"]]"
security_hud_text += "<b>Species:</b> [R.fields["species"]]"
security_hud_text += "<b>Minor Crimes:</b> [R.fields["mi_crim"]]"
security_hud_text += "<b>Details:</b> [R.fields["mi_crim_d"]]"
security_hud_text += "<b>Major Crimes:</b> [R.fields["ma_crim"]]"
@@ -405,7 +396,6 @@
security_hud_text += "<b>Notes:</b> [R.fields["notes"]]"
security_hud_text += "<a href='?src=\ref[src];secrecordComment=`'>\[View Comment Log\]</a>"
to_chat(usr, "<span class='filter_notice'>[jointext(security_hud_text, "<br>")]</span>")
>>>>>>> 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, "<b>Name:</b> [R.fields["name"]] <b>Blood Type:</b> [R.fields["b_type"]]")
to_chat(usr, "<b>Species:</b> [R.fields["species"]]")
to_chat(usr, "<b>DNA:</b> [R.fields["b_dna"]]")
to_chat(usr, "<b>Minor Disabilities:</b> [R.fields["mi_dis"]]")
to_chat(usr, "<b>Details:</b> [R.fields["mi_dis_d"]]")
to_chat(usr, "<b>Major Disabilities:</b> [R.fields["ma_dis"]]")
to_chat(usr, "<b>Details:</b> [R.fields["ma_dis_d"]]")
to_chat(usr, "<b>Notes:</b> [R.fields["notes"]]")
to_chat(usr, "<a href='?src=\ref[src];medrecordComment=`'>\[View Comment Log\]</a>")
=======
var/list/medical_hud_text = list()
medical_hud_text += "<b>Name:</b> [R.fields["name"]] <b>Blood Type:</b> [R.fields["b_type"]]"
medical_hud_text += "<b>Species:</b> [R.fields["species"]]"
medical_hud_text += "<b>DNA:</b> [R.fields["b_dna"]]"
medical_hud_text += "<b>Minor Disabilities:</b> [R.fields["mi_dis"]]"
medical_hud_text += "<b>Details:</b> [R.fields["mi_dis_d"]]"
@@ -536,7 +516,6 @@
medical_hud_text += "<b>Notes:</b> [R.fields["notes"]]"
medical_hud_text += "<a href='?src=\ref[src];medrecordComment=`'>\[View Comment Log\]</a>"
to_chat(usr, "<span class='filter_notice'>[jointext(medical_hud_text, "<br>")]</span>")
>>>>>>> 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, "<b>Name:</b> [R.fields["name"]]")
to_chat(usr, "<b>Species:</b> [R.fields["species"]]")
to_chat(usr, "<b>Assignment:</b> [R.fields["real_rank"]] ([R.fields["rank"]])")
to_chat(usr, "<b>Home System:</b> [R.fields["home_system"]]")
to_chat(usr, "<b>Birthplace:</b> [R.fields["birthplace"]]")
to_chat(usr, "<b>Citizenship:</b> [R.fields["citizenship"]]")
to_chat(usr, "<b>Primary Employer:</b> [R.fields["personal_faction"]]")
to_chat(usr, "<b>Religious Beliefs:</b> [R.fields["religion"]]")
to_chat(usr, "<b>Known Languages:</b> [R.fields["languages"]]")
to_chat(usr, "<b>Notes:</b> [R.fields["notes"]]")
to_chat(usr, "<a href='?src=\ref[src];emprecordComment=`'>\[View Comment Log\]</a>")
var/list/emp_hud_text = list()
emp_hud_text += "<b>Name:</b> [R.fields["name"]]"
emp_hud_text += "<b>Species:</b> [R.fields["species"]]"
emp_hud_text += "<b>Assignment:</b> [R.fields["real_rank"]] ([R.fields["rank"]])"
emp_hud_text += "<b>Home System:</b> [R.fields["home_system"]]"
emp_hud_text += "<b>Birthplace:</b> [R.fields["birthplace"]]"
emp_hud_text += "<b>Citizenship:</b> [R.fields["citizenship"]]"
emp_hud_text += "<b>Primary Employer:</b> [R.fields["personal_faction"]]"
emp_hud_text += "<b>Religious Beliefs:</b> [R.fields["religion"]]"
emp_hud_text += "<b>Known Languages:</b> [R.fields["languages"]]"
emp_hud_text += "<b>Notes:</b> [R.fields["notes"]]"
emp_hud_text += "<a href='?src=\ref[src];emprecordComment=`'>\[View Comment Log\]</a>"
to_chat(usr, "<span class='filter_notice'>[jointext(emp_hud_text, "<br>")]</span>")
read = 1
if(!read)
to_chat(usr, "<font color='red'>Unable to locate a data core entry for this person.</font>")
to_chat(usr, "<span class='filter_notice'><font color='red'>Unable to locate a data core entry for this person.</font></span>")
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, "<a href='?src=\ref[src];emprecordadd=`'>\[Add comment\]</a>")
to_chat(usr, "<span class='filter_notice'>No comment found.</span>")
to_chat(usr, "<span class='filter_notice'><a href='?src=\ref[src];emprecordadd=`'>\[Add comment\]</a></span>")
if(!read)
to_chat(usr, "<font color='red'>Unable to locate a data core entry for this person.</font>")
to_chat(usr, "<span class='filter_notice'><font color='red'>Unable to locate a data core entry for this person.</font></span>")
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("<span class='filter_say'><font color='blue'>You hear [src.real_name]'s voice: [say]</font></span>")
else
code/modules/mob/living/carbon/human/species/species_attack_vr.dm
+6 -6
View File
@@ -19,30 +19,30 @@
switch(attack_damage)
if(1 to 2)
user.visible_message("<span class='danger'>[user]'s fangs scrape across [target]'s cheek!</span>")
to_chat(target, "<font color='red'><b>Your face feels tingly!</b></font>")
to_chat(target, "<span class='danger'>Your face feels tingly!</span>")
target.bloodstr.add_reagent("numbenzyme",attack_damage) //Have to add this here, otherwise the swtich fails.
if(3 to 4)
user.visible_message("<span class='danger'>[user]'s fangs pierce into [target]'s neck at an odd, awkward angle!</span>")
to_chat(target, "<font color='red'><b>Your neck feels like it's on fire before going numb!</b></font>")
to_chat(target, "<span class='danger'>Your neck feels like it's on fire before going numb!</span>")
target.bloodstr.add_reagent("numbenzyme",attack_damage)
if(5)
user.visible_message("<span class='danger'>[user] sinks \his [pick(attack_noun)] <b><i>deep</i></b> into [target]'s neck, causing the vein to bulge outwards at some type of chemical is pumped into it!</span>")
to_chat(target, "<font color='red'><b>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!</b></font>")
to_chat(target, "<span class='danger'>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!</span>")
target.bloodstr.add_reagent("numbenzyme",attack_damage)
else
// ----- BODY ----- //
switch(attack_damage)
if(1 to 2)
user.visible_message("<span class='danger'>[user]'s fangs scrape across [target]'s [affecting.name]!</span>")
to_chat(target, "<font color='red'><b>Your [affecting.name] feels tingly!</b></font>")
to_chat(target, "<span class='danger'>Your [affecting.name] feels tingly!</span>")
target.bloodstr.add_reagent("numbenzyme",attack_damage)
if(3 to 4)
user.visible_message("<span class='danger'>[user]'s fangs pierce [pick("", "", "the side of")] [target]'s [affecting.name]!</span>")
to_chat(target, "<font color='red'><b>Your [affecting.name] feels like it's on fire before going numb!</b></font>")
to_chat(target, "<span class='danger'>Your [affecting.name] feels like it's on fire before going numb!</span>")
target.bloodstr.add_reagent("numbenzyme",attack_damage)
if(5)
user.visible_message("<span class='danger'>[user]'s fangs sink deep into [target]'s [affecting.name], one of their veins bulging outwards from the sudden fluid pumped into it!</span>")
to_chat(target, "<font color='red'><b>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!</b></font>")
to_chat(target, "<span class='danger'>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!</span>")
target.bloodstr.add_reagent("numbenzyme",attack_damage)
/datum/unarmed_attack/claws/shadekin
code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm
+1 -1
View File
@@ -189,5 +189,5 @@
species.base_species = new_species
wrapped_species_by_ref["\ref[src]"] = new_species
if (visible)
visible_message("<b>\The [src]</b> shifts and contorts, taking the form of \a [new_species]!")
visible_message("<span class='filter_notice'><b>\The [src]</b> shifts and contorts, taking the form of \a [new_species]!</span>")
regenerate_icons()
code/modules/mob/living/living.dm
+5 -21
View File
@@ -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:<br>[ooc_notes]")
to_chat(usr, "<span class='filter_notice'>[src]'s Metainfo:<br>[ooc_notes]</span>")
else if(client)
to_chat(usr, "[src]'s Metainfo:<br>[client.prefs.metadata]")
to_chat(usr, "<span class='filter_notice'>[src]'s Metainfo:<br>[client.prefs.metadata]</span>")
else
to_chat(usr, "[src] does not have any stored infomation!")
to_chat(usr, "<span class='filter_notice'>[src] does not have any stored infomation!</span>")
else
to_chat(usr, "OOC Metadata is not supported by this server!")
to_chat(usr, "<span class='filter_notice'>OOC Metadata is not supported by this server!</span>")
//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("<span class='filter_notice'><b>[src]</b> hands \the [H] \a [item].</span>", 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("<b>[src]</b> hands \the [H] \a [I].", SPAN_NOTICE("You give \the [target] \a [I]."))
visible_message("<span class='filter_notice'><b>[src]</b> hands \the [H] \a [I].</span>", SPAN_NOTICE("You give \the [target] \a [I]."))
else
to_chat(src, SPAN_NOTICE("You offer \the [I] to \the [target]."))
do_give(H)
code/modules/mob/living/living_vr.dm
+1 -1
View File
@@ -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, "<span class='filter_notice'>OOC notes updated.</span>")
log_admin("[key_name(usr)] updated their OOC notes mid-round.")
/mob/living/verb/set_voice_freq()
code/modules/mob/living/riding.dm
-5
View File
@@ -10,12 +10,7 @@
to_chat(src, "<span class='filter_notice'>Rider control enabled.</span>")
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, "<span class='filter_notice'>Rider control restricted.</span>")
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
return
return
code/modules/mob/living/silicon/ai/ai.dm
+2 -16
View File
@@ -758,13 +758,8 @@ var/list/ai_verbs_default = list(
if(!do_after(user,40 * W.toolspeed))
user.visible_message("<span class='notice'>\The [user] decides not to unbolt \the [src].</span>")
return
<<<<<<< HEAD
user.visible_message("<font color='blue'>\The [user] finishes unfastening \the [src]!</font>")
anchored = FALSE
=======
user.visible_message("<span class='notice'>\The [user] finishes unfastening \the [src]!</span>")
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("<span class='notice'>\The [user] decides not to bolt \the [src].</span>")
return
<<<<<<< HEAD
user.visible_message("<font color='blue'>\The [user] finishes fastening down \the [src]!</font>")
anchored = TRUE
=======
user.visible_message("<span class='notice'>\The [user] finishes fastening down \the [src]!</span>")
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, "<span class='filter_notice'>Your hologram will [hologram_follow ? "follow" : "no longer follow"] you now.</span>")
>>>>>>> 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)
code/modules/mob/living/silicon/pai/pai.dm
+3 -15
View File
@@ -295,14 +295,10 @@
canmove = TRUE
var/turf/T = get_turf(src)
<<<<<<< HEAD
if(istype(T)) T.visible_message("<b>[src]</b> folds outwards, expanding into a mobile form.")
if(istype(T)) T.visible_message("<span class='filter_notice'><b>[src]</b> folds outwards, expanding into a mobile form.</span>")
verbs |= /mob/living/silicon/pai/proc/pai_nom
verbs |= /mob/living/proc/vertical_nom
update_icon()
=======
if(istype(T)) T.visible_message("<span class='filter_notice'><b>[src]</b> folds outwards, expanding into a mobile form.</span>")
>>>>>>> 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, "<span class='notice'>You are now [resting ? "resting" : "getting up"]</span>")
=======
to_chat(src, "<span class='notice'>You are now [resting ? "resting" : "getting up"].</span>")
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
to_chat(src, "<span class='notice'>You are now [resting ? "resting" : "getting up"].</span>")
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("<b>[src]</b> neatly folds inwards, compacting down to a rectangular card.")
=======
if(istype(T)) T.visible_message("<span class='filter_notice'><b>[src]</b> neatly folds inwards, compacting down to a rectangular card.</span>")
>>>>>>> 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("<span class='filter_notice'><b>[src]</b> neatly folds inwards, compacting down to a rectangular card.</span>")
if(client)
src.stop_pulling()
code/modules/mob/living/silicon/pai/pai_vr.dm
+10 -10
View File
@@ -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("<span class='filter_notice'>\The [card] chimes.</span>", 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, "<span class='filter_notice'>Your selected chassis cannot modify its eye glow!</span>")
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, "<span class='filter_notice'>[name] configuration saved to global pAI settings.</span>")
/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, "<span class='cult'>You print a message to your screen, \"[message]\"</span>")
to_chat(src, "<span class='filter_say cult'>You print a message to your screen, \"[message]\"</span>")
if(isliving(card.loc))
var/mob/living/L = card.loc
if(L.client)
to_chat(L, "<span class='cult'>[src.name]'s screen prints, \"[message]\"</span>")
to_chat(L, "<span class='filter_say cult'>[src.name]'s screen prints, \"[message]\"</span>")
else return
else if(isbelly(card.loc))
var/obj/belly/b = card.loc
if(b.owner.client)
to_chat(b.owner, "<span class='cult'>[src.name]'s screen prints, \"[message]\"</span>")
to_chat(b.owner, "<span class='filter_say cult'>[src.name]'s screen prints, \"[message]\"</span>")
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, "<span class='cult'>[src.name]'s screen prints, \"[message]\"</span>")
to_chat(L, "<span class='filter_say cult'>[src.name]'s screen prints, \"[message]\"</span>")
else return
else if(isbelly(p.loc))
var/obj/belly/b = card.loc
if(b.owner.client)
to_chat(b.owner, "<span class='cult'>[src.name]'s screen prints, \"[message]\"</span>")
to_chat(b.owner, "<span class='filter_say cult'>[src.name]'s screen prints, \"[message]\"</span>")
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, "<span class='cult'>[src.name]'s screen prints, \"[message]\"</span>")
to_chat(G, "<span class='filter_say cult'>[src.name]'s screen prints, \"[message]\"</span>")
/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, "<span class ='warning'>You can't do that right now.</span>")
to_chat(src, "<span class='warning'>You can't do that right now.</span>")
return
for(var/thing in software)
var/datum/pai_software/S = software[thing]
code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
+17 -17
View File
@@ -268,15 +268,15 @@
if(user.client && (target in user.client.screen))
to_chat(user, "<span class='warning'>You need to take \the [target.name] off before cleaning it!</span>")
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].", "<span class='notice'>You begin to lap up water from [target.name].</span>")
user.visible_message("<span class='filter_notice'>[user] begins to lap up water from [target.name].</span>", "<span class='notice'>You begin to lap up water from [target.name].</span>")
if(do_after (user, 50))
water.add_charge(50)
to_chat(src, "You refill some of your water reserves.")
to_chat(src, "<span class='filter_notice'>You refill some of your water reserves.</span>")
else if(water.energy < 5)
to_chat(user, "<span class='notice'>Your mouth feels dry. You should drink up some water .</span>")
return
else if(istype(target,/obj/effect/decal/cleanable))
user.visible_message("[user] begins to lick off \the [target.name].", "<span class='notice'>You begin to lick off \the [target.name]...</span>")
user.visible_message("<span class='filter_notice'>[user] begins to lick off \the [target.name].</span>", "<span class='notice'>You begin to lick off \the [target.name]...</span>")
if(do_after (user, 50))
to_chat(user, "<span class='notice'>You finish licking off \the [target.name].</span>")
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].", "<span class='notice'>You begin to nibble away at \the [target.name]...</span>")
user.visible_message("<span class='filter_notice'>[user] nibbles away at \the [target.name].</span>", "<span class='notice'>You begin to nibble away at \the [target.name]...</span>")
if(do_after (user, 50))
user.visible_message("[user] finishes eating \the [target.name].", "<span class='notice'>You finish eating \the [target.name].</span>")
user.visible_message("<span class='filter_notice'>[user] finishes eating \the [target.name].</span>", "<span class='notice'>You finish eating \the [target.name].</span>")
to_chat(user, "<span class='notice'>You finish off \the [target.name].</span>")
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.", "<span class='notice'>You begin cramming \the [target.name] down your throat...</span>")
user.visible_message("<span class='filter_notice'>[user] begins cramming \the [target.name] down its throat.</span>", "<span class='notice'>You begin cramming \the [target.name] down your throat...</span>")
if(do_after (user, 50))
user.visible_message("[user] finishes gulping down \the [target.name].", "<span class='notice'>You finish swallowing \the [target.name].</span>")
user.visible_message("<span class='filter_notice'>[user] finishes gulping down \the [target.name].</span>", "<span class='notice'>You finish swallowing \the [target.name].</span>")
to_chat(user, "<span class='notice'>You finish off \the [target.name], and gain some charge!</span>")
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...", "<span class='notice'>You begin to lick \the [target.name] clean...</span>")
user.visible_message("<span class='filter_notice'>[user] begins to lick \the [target.name] clean...</span>", "<span class='notice'>You begin to lick \the [target.name] clean...</span>")
if(do_after (user, 50))
to_chat(user, "<span class='notice'>You clean \the [target.name].</span>")
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...", "<span class='notice'>You begin to lick \the [target.name] clean...</span>")
user.visible_message("<span class='filter_notice'>[user] begins to lick \the [target.name] clean...</span>", "<span class='notice'>You begin to lick \the [target.name] clean...</span>")
if(do_after (user, 50))
to_chat(user, "<span class='notice'>You clean \the [target.name].</span>")
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, "<span class='filter_notice'>The light color has been changed.</span>")
return
else
if(uses >= max_uses)
@@ -416,7 +416,7 @@
if(glass.energy < 125)
to_chat(user, "<span class='warning'>Insufficient material reserves.</span>")
return
to_chat(user, "It has [uses] lights remaining. Attempting to fabricate a replacement. Please stand still.")
to_chat(user, "<span class='filter_notice'>It has [uses] lights remaining. Attempting to fabricate a replacement. Please stand still.</span>")
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, "<span class='filter_notice'>It has [uses] lights remaining.</span>")
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, "<span class='filter_notice'>Your leap actuators are still recharging.</span>")
return
if(cell.charge < 1000)
to_chat(src, "Cell charge too low to continue.")
to_chat(src, "<span class='filter_notice'>Cell charge too low to continue.</span>")
return
if(usr.incapacitated(INCAPACITATION_DISABLED))
to_chat(src, "You cannot leap in your current state.")
to_chat(src, "<span class='filter_notice'>You cannot leap in your current state.</span>")
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, "<span class='filter_notice'>You cannot leap in your current state.</span>")
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, "<span class='filter_notice'>Your Tank now displays [choice]. Drink up and enjoy!</span>")
updateicon()
return 1
code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
+4 -2
View File
@@ -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, "<span class='notice'>\The [tech_item] has level [tech_item.origin_tech[T]] in [CallTechName(T)].</span>")
tech_levels += "\The [tech_item] has level [tech_item.origin_tech[T]] in [CallTechName(T)]."
to_chat(user, "<span class='notice'>[jointext(tech_levels, "<br>")]</span>")
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, "<span class='filter_notice'>As [T] melts away around you, you find yourself in [hound]'s [name].</span>")
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
code/modules/mob/living/silicon/robot/robot_items.dm
+2 -8
View File
@@ -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("<font color='blue'>\The [src.loc] dispenses a sheet of crisp white paper.</font>")
new /obj/item/weapon/paper(T)
=======
/obj/item/form_printer/proc/deploy_paper(var/turf/T)
T.visible_message("<span class='notice'>\The [src.loc] dispenses a sheet of crisp white paper.</span>")
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, "<span class='filter_notice'>You can't reach!</span>")
return
if(istype(A, /turf))
try_deploy_inflatable(A, user)
code/modules/mob/living/silicon/robot/robot_vr.dm
+2 -2
View File
@@ -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, "<span class='filter_notice'>You refill the extinguisher using your water reserves.</span>")
else
to_chat(src, "Insufficient water reserves.")
to_chat(src, "<span class='filter_notice'>Insufficient water reserves.</span>")
//RIDING
/datum/riding/dogborg
code/modules/mob/living/silicon/say.dm
+1 -6
View File
@@ -88,15 +88,10 @@
var/obj/machinery/hologram/holopad/T = src.holo
if(T && T.masters[src])
var/rendered = "<span class='game say'><span class='name'>[name]</span> <span class='message'>[message]</span></span>"
<<<<<<< HEAD
to_chat(src, "<i><span class='game say'>Holopad action relayed, <span class='name'>[real_name]</span> <span class='message'>[message]</span></span></i>")
to_chat(src, "<span class='game say'><i>Holopad action relayed, <span class='name'>[real_name]</span> <span class='message'>[message]</span></i></span>")
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, "<span class='game say'><i>Holopad action relayed, <span class='name'>[real_name]</span> <span class='message'>[message]</span></i></span>")
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"]
code/modules/mob/living/silicon/silicon.dm
-49
View File
@@ -223,7 +223,6 @@
var/synth = (L in speech_synthesizer_langs)
. += "<b>[L.name] ([get_language_prefix()][L.key])</b>[synth ? default_str : null]<br>Speech Synthesizer: <i>[synth ? "YES" : "NOT SUPPORTED"]</i><br>[L.desc]<br><br>"
<<<<<<< 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, "<span class='notice'>Security records overlay enabled.</span>")
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, "<span class='notice'>Life signs monitor overlay enabled.</span>")
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, "<span class='filter_notice'>Sensor augmentations disabled.</span>")
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"
code/modules/mob/say_vr.dm
+1 -3
View File
@@ -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, "<span class='filter_say'>[isobserver(M) ? "[message] ([ghost_follow_link(src, M)])" : message]</span>")
log_emote(message, src)
/mob/verb/select_speech_bubble()
code/modules/nifsoft/nif.dm
+1 -1
View File
@@ -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,"<b>\[\icon[src.big_icon][bicon(src.big_icon)]NIF\]</b> displays, \"<span class='[alert ? "danger" : "notice"]'>[message]</span>\"")
to_chat(human,"<span class='filter_nif'><b>\[\icon[src.big_icon][bicon(src.big_icon)]NIF\]</b> displays, \"<span class='[alert ? "danger" : "notice"]'>[message]</span>\"</span>")
if(prob(1)) human.visible_message("<span class='notice'>\The [human] [pick(look_messages)].</span>")
if(alert)
human << bad_sound
code/modules/nifsoft/nifsoft.dm
+1 -1
View File
@@ -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: <br><span class='notice'>[newlaws]</span>")
to_chat(user,"<span class='filter_notice'>You set the laws to: <br><span class='notice'>[newlaws]</span></span>")
laws = newlaws
/obj/item/weapon/disk/nifsoft/compliance/extra_params()
code/modules/nifsoft/software/13_soulcatcher.dm
+8 -8
View File
@@ -72,11 +72,11 @@
/datum/nifsoft/soulcatcher/proc/notify_into(var/message)
var/sound = nif.good_sound
to_chat(nif.human,"<b>\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\]</b> <b>Soulcatcher</b> displays, \"<span class='notice nif'>[message]</span>\"")
to_chat(nif.human,"<span class='nif'><b>\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\]</b> <b>Soulcatcher</b> displays, \"<span class='notice nif'>[message]</span>\"</span>")
nif.human << sound
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS,"<b>\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\]</b> <b>Soulcatcher</b> displays, \"<span class='notice nif'>[message]</span>\"")
to_chat(CS,"<span class='nif'><b>\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\]</b> <b>Soulcatcher</b> displays, \"<span class='notice nif'>[message]</span>\"</span>")
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("<b>[sender_name]</b> says, \"[message]\"")
sender.eyeobj.visible_message("<span class='game say'><b>[sender_name]</b> says, \"[message]\"")
//Not AR Projecting
else
to_chat(nif.human,"<span class='game say nif'><b>\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\"</span>")
to_chat(nif.human,"<span class='nif'><b>\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\"</span>")
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS,"<span class='game say nif'><b>\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\"</span>")
to_chat(CS,"<span class='nif'><b>\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\"</span>")
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("<span class='emote'>[sender_name] [message]</span>")
//Not AR Projecting
else
to_chat(nif.human,"<span class='emote nif'><b>\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\]</b> <b>[sender_name]</b> [message]</span>")
to_chat(nif.human,"<span class='nif'><b>\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\]</b> <b>[sender_name]</b> [message]</span>")
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS,"<span class='emote nif'><b>\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\]</b> <b>[sender_name]</b> [message]</span>")
to_chat(CS,"<span class='nif'><b>\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\]</b> <b>[sender_name]</b> [message]</span>")
log_nme(message,nif.human.real_name,sender)
code/modules/surgery/organs_internal.dm
+2 -72
View File
@@ -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, "<span class='notice'>You decide against preparing any organs for removal.</span>")
user.visible_message("[user] starts pulling \the [tool] from [target]'s [affected]", \
"You start pulling \the [tool] from [target]'s [affected].")
user.visible_message("<span class='filter_notice'>[user] starts pulling \the [tool] from [target]'s [affected].</span>", \
"<span class='filter_notice'>You start pulling \the [tool] from [target]'s [affected].</span>")
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("<span class='filter_notice'>[user] starts removing [target]'s [target.op_stage.current_organ] with \the [tool].</span>", \
"<span class='filter_notice'>You start removing [target]'s [target.op_stage.current_organ] with \the [tool].</span>")
>>>>>>> 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("<span class='warning'>[user]'s hand slips, damaging the flesh in [target]'s [affected.name] with \the [tool]!</span>", \
"<span class='warning'>Your hand slips, damaging the flesh in [target]'s [affected.name] with \the [tool]!</span>")
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("<span class='filter_notice'>[user] starts ripping [target]'s [target.op_stage.current_organ] out with \the [tool].</span>", \
"<span class='filter_notice'>You start ripping [target]'s [target.op_stage.current_organ] out with \the [tool].</span>")
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("<span class='notice'>[user] has ripped [target]'s [target.op_stage.current_organ] out with \the [tool].</span>", \
"<span class='notice'>You have ripped [target]'s [target.op_stage.current_organ] out with \the [tool].</span>")
// 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("<span class='warning'>[user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!</span>", \
"<span class='warning'>Your hand slips, damaging [target]'s [affected.name] with \the [tool]!</span>")
affected.createwound(BRUISE, 20)
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
code/modules/surgery/robotics.dm
-10
View File
@@ -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("<span class='filter_notice'>[user] starts to decouple [target]'s [target.op_stage.current_organ] with \the [tool].</span>", \
"<span class='filter_notice'>You start to decouple [target]'s [target.op_stage.current_organ] with \the [tool].</span>" )
>>>>>>> 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("<span class='filter_notice'>[user] begins reattaching [target]'s [target.op_stage.current_organ] with \the [tool].</span>", \
"<span class='filter_notice'>You start reattaching [target]'s [target.op_stage.current_organ] with \the [tool].</span>")
>>>>>>> 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)
code/modules/vchat/js/vchat.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
code/modules/vore/resizing/resize_vr.dm
+3 -3
View File
@@ -236,9 +236,9 @@
tmob_message = tail.msg_owner_stepunder
if(src_message)
to_chat(src, STEP_TEXT_OWNER(src_message))
to_chat(src, "<span class='filter_notice'>[STEP_TEXT_OWNER(src_message)]</span>")
if(tmob_message)
to_chat(tmob, STEP_TEXT_PREY(tmob_message))
to_chat(tmob, "<span class='filter_notice'>[STEP_TEXT_PREY(tmob_message)]</span>")
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, "<span class='filter_notice'>You will [pickup_active ? "now" : "no longer"] attempt to pick up mobs when clicking them with help intent.</span>")
#undef STEP_TEXT_OWNER
#undef STEP_TEXT_PREY
code/modules/xenoarcheaology/artifacts/replicator.dm
+2 -7
View File
@@ -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 = "<font color='blue'>\icon[src][bicon(src)] a [pick("loud","soft","sinister","eery","triumphant","depressing","cheerful","angry")] \
=======
fail_message = "<span class='notice'>[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 = "<span class='notice'>\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("<b>\The [user]</b> inserts \the [W] into \the [src].")
src.visible_message("<span class='notice'><b>\The [user]</b> inserts \the [W] into \the [src].</span>")
code/modules/xenoarcheaology/artifacts/replicator_vr.dm
+4 -4
View File
@@ -275,7 +275,7 @@
inserted_human.drop_from_inventory(I)
inserted_mob.loc = src
stored_materials.Add(inserted_mob)
src.visible_message("<b>\The [user]</b> inserts \the [inserted_mob] into \the [src].")
src.visible_message("<span class='filter_notice'><b>\The [user]</b> inserts \the [inserted_mob] into \the [src].</span>")
return
else
to_chat(user, "<span class='notice'>You cannot put \the [W] into the machine. ((The micro must be connected to the server.))</span>")
@@ -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("<b>\The [user]</b> inserts \the [W] into \the [src].")
src.visible_message("<span class='filter_notice'><b>\The [user]</b> inserts \the [W] into \the [src].</span>")
/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("<b>\The [user]</b> inserts \the [inserted_mob] into \the [src].")
src.visible_message("<span class='filter_notice'><b>\The [user]</b> inserts \the [inserted_mob] into \the [src].</span>")
return
else
to_chat(user, "<span class='notice'>You cannot put \the [W] into the machine. ((They must be connected to the server.))</span>")
@@ -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("<b>\The [user]</b> inserts \the [W] into \the [src].")
src.visible_message("<span class='filter_notice'><b>\The [user]</b> inserts \the [W] into \the [src].</span>")
/obj/machinery/replicator/clothing/tgui_interact(mob/user, datum/tgui/ui) //This creates the menu.
code/modules/xenoarcheaology/effect.dm
+1 -19
View File
@@ -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("<span class='filter_notice'><font color='red'>[bicon(toplevelholder)] [toplevelholder] [display_msg]</font></span>")
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("<font color='red'>\icon[toplevelholder][bicon(toplevelholder)] [toplevelholder] [display_msg]</font>")
toplevelholder.visible_message("<span class='filter_notice'><font color='red'>\icon[toplevelholder][bicon(toplevelholder)] [toplevelholder] [display_msg]</font></span>")
/datum/artifact_effect/proc/DoEffectTouch(var/mob/user)
/datum/artifact_effect/proc/DoEffectAura(var/atom/holder)