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

Merge pull request #4584 from CHOMPStation2/upstream-merge-13371

Browse Source 
[MIRROR] Fixes in-chat icons being broken in oldchat
This commit is contained in:
Nadyr
2022-07-20 21:12:22 -04:00
committed by GitHub
parent d96777a733 895c47db8b
commit c5a0f8fb24
96 changed files with 362 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/verbs/pray.dm
View File

@@ -17,7 +17,7 @@
return
var/image/cross = image('icons/obj/storage.dmi',"bible")
msg = "<font color='blue'>[bicon(cross)] <b><font color=purple>PRAY: </font>[key_name(src, 1)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[src]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[src]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[src]'>SM</A>) ([admin_jump_link(src, src)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;adminspawncookie=\ref[src]'>SC</a>) (<A HREF='?_src_=holder;adminsmite=\ref[src]'>SMITE</a>):</b> [msg]</font>"
msg = "<font color='blue'>\icon[cross][bicon(cross)] <b><font color=purple>PRAY: </font>[key_name(src, 1)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[src]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[src]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[src]'>SM</A>) ([admin_jump_link(src, src)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;adminspawncookie=\ref[src]'>SC</a>) (<A HREF='?_src_=holder;adminsmite=\ref[src]'>SMITE</a>):</b> [msg]</font>"
for(var/client/C in GLOB.admins)
if(R_ADMIN|R_EVENT & C.holder.rights)

6
code/modules/assembly/holder.dm
View File

@@ -16,13 +16,13 @@
/obj/item/device/assembly_holder/proc/attach(var/obj/item/device/assembly/D, var/obj/item/device/assembly/D2, var/mob/user)
if(!D || !D2)
return FALSE
if(!istype(D) || !istype(D2))
return FALSE
if(D.secured || D2.secured)
return FALSE
if(user)
user.remove_from_mob(D)
user.remove_from_mob(D2)
@@ -151,7 +151,7 @@
if(!D)
return 0
if(!secured)
visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
visible_message("\icon[src][bicon(src)] *beep* *beep*", "*beep* *beep*")
if((normal) && (a_right) && (a_left))
if(a_right != D)
a_right.pulsed(0)

2
code/modules/assembly/infrared.dm
View File

@@ -98,7 +98,7 @@
pulse(0)
QDEL_LIST_NULL(i_beams) //They will get recreated next process() if the situation is still appropriate
if(!holder)
visible_message("[bicon(src)] *beep* *beep*")
visible_message("\icon[src][bicon(src)] *beep* *beep*")
/obj/item/device/assembly/infra/tgui_interact(mob/user, datum/tgui/ui)
if(!secured)

2
code/modules/assembly/proximity.dm
View File

@@ -47,7 +47,7 @@
var/turf/mainloc = get_turf(src)
pulse(0)
if(!holder)
mainloc.visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
mainloc.visible_message("\icon[src][bicon(src)] *beep* *beep*", "*beep* *beep*")
/obj/item/device/assembly/prox_sensor/process()
if(scanning)

2
code/modules/assembly/signaler.dm
View File

@@ -117,7 +117,7 @@
if(!holder)
for(var/mob/O in hearers(1, src.loc))
O.show_message("[bicon(src)] *beep* *beep*", 3, "*beep* *beep*", 2)
O.show_message("\icon[src][bicon(src)] *beep* *beep*", 3, "*beep* *beep*", 2)
/obj/item/device/assembly/signaler/proc/set_frequency(new_frequency)
if(!frequency)

2
code/modules/assembly/timer.dm
View File

@@ -44,7 +44,7 @@
return 0
pulse(0)
if(!holder)
visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
visible_message("\icon[src][bicon(src)] *beep* *beep*", "*beep* *beep*")
/obj/item/device/assembly/timer/process()
if(timing && time-- <= 0)

4
code/modules/assembly/voice.dm
View File

@@ -13,7 +13,7 @@
recorded = msg
listening = 0
var/turf/T = get_turf(src) //otherwise it won't work in hand
T.visible_message("[bicon(src)] beeps, \"Activation message is '[recorded]'.\"")
T.visible_message("\icon[src][bicon(src)] beeps, \"Activation message is '[recorded]'.\"")
else
if(findtext(msg, recorded))
pulse(0)
@@ -23,7 +23,7 @@
if(!holder)
listening = !listening
var/turf/T = get_turf(src)
T.visible_message("[bicon(src)] beeps, \"[listening ? "Now" : "No longer"] recording input.\"")
T.visible_message("\icon[src][bicon(src)] beeps, \"[listening ? "Now" : "No longer"] recording input.\"")
/obj/item/device/assembly/voice/attack_self(mob/user)

2
code/modules/clothing/spacesuits/rig/rig.dm
View File

@@ -178,7 +178,7 @@
for(var/obj/item/piece in list(helmet,gloves,chest,boots))
if(!piece || piece.loc != wearer)
continue
. += "[bicon(piece)] \The [piece] [piece.gender == PLURAL ? "are" : "is"] deployed."
. += "\icon[piece][bicon(piece)] \The [piece] [piece.gender == PLURAL ? "are" : "is"] deployed."
if(src.loc == usr)
. += "The access panel is [locked? "locked" : "unlocked"]."

2
code/modules/detectivework/microscope/dnascanner.dm
View File

@@ -105,7 +105,7 @@
last_process_worldtime = world.time
/obj/machinery/dnaforensics/proc/complete_scan()
visible_message("<span class='notice'>[bicon(src)] makes an insistent chime.</span>", 2)
visible_message("<span class='notice'>\icon[src][bicon(src)] makes an insistent chime.</span>", 2)
update_icon()
if(bloodsamp)
var/obj/item/weapon/paper/P = new(src)

22
code/modules/economy/ATM.dm
View File

@@ -76,7 +76,7 @@ log transactions
//display a message to the user
var/response = pick("Initiating withdraw. Have a nice day!", "CRITICAL ERROR: Activating cash chamber panic siphon.","PIN Code accepted! Emptying account balance.", "Jackpot!")
to_chat(user, "<span class='warning'>[bicon(src)] The [src] beeps: \"[response]\"</span>")
to_chat(user, "<span class='warning'>\icon[src][bicon(src)] The [src] beeps: \"[response]\"</span>")
return 1
/obj/machinery/atm/attackby(obj/item/I as obj, mob/user as mob)
@@ -85,7 +85,7 @@ log transactions
if(istype(I, /obj/item/weapon/card))
if(emagged > 0)
//prevent inserting id into an emagged ATM
to_chat(user, "<font color='red'>[bicon(src)] CARD READER ERROR. This system has been compromised!</font>")
to_chat(user, "<font color='red'>\icon[src][bicon(src)] CARD READER ERROR. This system has been compromised!</font>")
return
else if(istype(I,/obj/item/weapon/card/emag))
I.resolve_attackby(src, user)
@@ -234,7 +234,7 @@ log transactions
var/target_account_number = text2num(href_list["target_acc_number"])
var/transfer_purpose = href_list["purpose"]
if(charge_to_account(target_account_number, authenticated_account.owner_name, transfer_purpose, machine_id, transfer_amount))
to_chat(usr, "[bicon(src)]<span class='info'>Funds transfer successful.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='info'>Funds transfer successful.</span>")
authenticated_account.money -= transfer_amount
//create an entry in the account transaction log
@@ -247,10 +247,10 @@ log transactions
T.amount = "([transfer_amount])"
authenticated_account.transaction_log.Add(T)
else
to_chat(usr, "[bicon(src)]<span class='warning'>Funds transfer failed.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>Funds transfer failed.</span>")
else
to_chat(usr, "[bicon(src)]<span class='warning'>You don't have enough funds to do that!</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>You don't have enough funds to do that!</span>")
if("view_screen")
view_screen = text2num(href_list["view_screen"])
if("change_security_level")
@@ -288,11 +288,11 @@ log transactions
T.time = stationtime2text()
failed_account.transaction_log.Add(T)
else
to_chat(usr, "<font color='red'>[bicon(src)] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining.</font>")
to_chat(usr, "<font color='red'>\icon[src][bicon(src)] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining.</font>")
previous_account_number = tried_account_num
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1)
else
to_chat(usr, "<font color='red'>[bicon(src)] incorrect pin/account combination entered.</font>")
to_chat(usr, "<font color='red'>\icon[src][bicon(src)] incorrect pin/account combination entered.</font>")
number_incorrect_tries = 0
else
playsound(src, 'sound/machines/twobeep.ogg', 50, 1)
@@ -308,7 +308,7 @@ log transactions
T.time = stationtime2text()
authenticated_account.transaction_log.Add(T)
to_chat(usr, "<font color='blue'>[bicon(src)] Access granted. Welcome user '[authenticated_account.owner_name].</font>'")
to_chat(usr, "<font color='blue'>\icon[src][bicon(src)] Access granted. Welcome user '[authenticated_account.owner_name].</font>'")
previous_account_number = tried_account_num
if("e_withdrawal")
@@ -336,7 +336,7 @@ log transactions
T.time = stationtime2text()
authenticated_account.transaction_log.Add(T)
else
to_chat(usr, "[bicon(src)]<span class='warning'>You don't have enough funds to do that!</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>You don't have enough funds to do that!</span>")
if("withdrawal")
var/amount = max(text2num(href_list["funds_amount"]),0)
amount = round(amount, 0.01)
@@ -361,7 +361,7 @@ log transactions
T.time = stationtime2text()
authenticated_account.transaction_log.Add(T)
else
to_chat(usr, "[bicon(src)]<span class='warning'>You don't have enough funds to do that!</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>You don't have enough funds to do that!</span>")
if("balance_statement")
if(authenticated_account)
var/obj/item/weapon/paper/R = new(src.loc)
@@ -433,7 +433,7 @@ log transactions
if(!held_card)
//this might happen if the user had the browser window open when somebody emagged it
if(emagged > 0)
to_chat(usr, "<font color='red'>[bicon(src)] The ATM card reader rejected your ID because this machine has been sabotaged!</font>")
to_chat(usr, "<font color='red'>\icon[src][bicon(src)] The ATM card reader rejected your ID because this machine has been sabotaged!</font>")
else
var/obj/item/I = usr.get_active_hand()
if (istype(I, /obj/item/weapon/card/id))

42
code/modules/economy/EFTPOS.dm
View File

@@ -107,7 +107,7 @@
if(linked_account)
scan_card(I, O)
else
to_chat(usr, "[bicon(src)]<span class='warning'>Unable to connect to linked account.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>Unable to connect to linked account.</span>")
else if (istype(O, /obj/item/weapon/spacecash/ewallet))
var/obj/item/weapon/spacecash/ewallet/E = O
if (linked_account)
@@ -115,7 +115,7 @@
if(transaction_locked && !transaction_paid)
if(transaction_amount <= E.worth)
playsound(src, 'sound/machines/chime.ogg', 50, 1)
src.visible_message("[bicon(src)] \The [src] chimes.")
src.visible_message("\icon[src][bicon(src)] \The [src] chimes.")
transaction_paid = 1
//transfer the money
@@ -132,11 +132,11 @@
T.time = stationtime2text()
linked_account.transaction_log.Add(T)
else
to_chat(usr, "[bicon(src)]<span class='warning'>\The [O] doesn't have that much money!</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>\The [O] doesn't have that much money!</span>")
else
to_chat(usr, "[bicon(src)]<span class='warning'>Connected account has been suspended.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>Connected account has been suspended.</span>")
else
to_chat(usr, "[bicon(src)]<span class='warning'>EFTPOS is not connected to an account.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>EFTPOS is not connected to an account.</span>")
else
..()
@@ -154,14 +154,14 @@
tgui_alert_async(usr, "That is not a valid code!")
print_reference()
else
to_chat(usr, "[bicon(src)]<span class='warning'>Incorrect code entered.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>Incorrect code entered.</span>")
if("change_id")
var/attempt_code = text2num(input(usr, "Re-enter the current EFTPOS access code", "Confirm EFTPOS code"))
if(attempt_code == access_code)
eftpos_name = sanitize(input(usr, "Enter a new terminal ID for this device", "Enter new EFTPOS ID"), MAX_NAME_LEN) + " EFTPOS scanner"
print_reference()
else
to_chat(usr, "[bicon(src)]<span class='warning'>Incorrect code entered.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>Incorrect code entered.</span>")
if("link_account")
var/attempt_account_num = tgui_input_number(usr, "Enter account number to pay EFTPOS charges into", "New account number")
var/attempt_pin = tgui_input_number(usr, "Enter pin code", "Account pin")
@@ -169,9 +169,9 @@
if(linked_account)
if(linked_account.suspended)
linked_account = null
to_chat(usr, "[bicon(src)]<span class='warning'>Account has been suspended.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>Account has been suspended.</span>")
else
to_chat(usr, "[bicon(src)]<span class='warning'>Account not found.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>Account not found.</span>")
if("trans_purpose")
var/choice = sanitize(input(usr, "Enter reason for EFTPOS transaction", "Transaction purpose"))
if(choice) transaction_purpose = choice
@@ -194,14 +194,14 @@
else if(linked_account)
transaction_locked = 1
else
to_chat(usr, "[bicon(src)]<span class='warning'>No account connected to send transactions to.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>No account connected to send transactions to.</span>")
if("scan_card")
if(linked_account)
var/obj/item/I = usr.get_active_hand()
if (istype(I, /obj/item/weapon/card))
scan_card(I)
else
to_chat(usr, "[bicon(src)]<span class='warning'>Unable to link accounts.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>Unable to link accounts.</span>")
if("reset")
//reset the access code - requires HoP/captain access
var/obj/item/I = usr.get_active_hand()
@@ -209,10 +209,10 @@
var/obj/item/weapon/card/id/C = I
if((access_cent_captain in C.access) || (access_hop in C.access) || (access_captain in C.access))
access_code = 0
to_chat(usr, "[bicon(src)]<span class='info'>Access code reset to 0.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='info'>Access code reset to 0.</span>")
else if (istype(I, /obj/item/weapon/card/emag))
access_code = 0
to_chat(usr, "[bicon(src)]<span class='info'>Access code reset to 0.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='info'>Access code reset to 0.</span>")
src.attack_self(usr)
@@ -236,7 +236,7 @@
if(!D.suspended)
if(transaction_amount <= D.money)
playsound(src, 'sound/machines/chime.ogg', 50, 1)
src.visible_message("[bicon(src)] \The [src] chimes.")
src.visible_message("\icon[src][bicon(src)] \The [src] chimes.")
transaction_paid = 1
//transfer the money
@@ -265,25 +265,25 @@
T.time = stationtime2text()
linked_account.transaction_log.Add(T)
else
to_chat(usr, "[bicon(src)]<span class='warning'>You don't have that much money!</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>You don't have that much money!</span>")
else
to_chat(usr, "[bicon(src)]<span class='warning'>Your account has been suspended.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>Your account has been suspended.</span>")
else
to_chat(usr, "[bicon(src)]<span class='warning'>Unable to access account. Check security settings and try again.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>Unable to access account. Check security settings and try again.</span>")
else
to_chat(usr, "[bicon(src)]<span class='warning'>Connected account has been suspended.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>Connected account has been suspended.</span>")
else
to_chat(usr, "[bicon(src)]<span class='warning'>EFTPOS is not connected to an account.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>EFTPOS is not connected to an account.</span>")
else if (istype(I, /obj/item/weapon/card/emag))
if(transaction_locked)
if(transaction_paid)
to_chat(usr, "[bicon(src)]<span class='info'>You stealthily swipe \the [I] through \the [src].</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='info'>You stealthily swipe \the [I] through \the [src].</span>")
transaction_locked = 0
transaction_paid = 0
else
usr.visible_message("<span class='info'>\The [usr] swipes a card through \the [src].</span>")
playsound(src, 'sound/machines/chime.ogg', 50, 1)
src.visible_message("[bicon(src)] \The [src] chimes.")
src.visible_message("\icon[src][bicon(src)] \The [src] chimes.")
transaction_paid = 1
//emag?

44
code/modules/economy/cash_register.dm
View File

@@ -103,7 +103,7 @@
if(allowed(usr))
locked = !locked
else
to_chat(usr, "[bicon(src)]<span class='warning'>Insufficient access.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>Insufficient access.</span>")
if("toggle_cash_lock")
cash_locked = !cash_locked
if("link_account")
@@ -113,9 +113,9 @@
if(linked_account)
if(linked_account.suspended)
linked_account = null
src.visible_message("[bicon(src)]<span class='warning'>Account has been suspended.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='warning'>Account has been suspended.</span>")
else
to_chat(usr, "[bicon(src)]<span class='warning'>Account not found.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>Account not found.</span>")
if("custom_order")
var/t_purpose = sanitize(tgui_input_text(usr, "Enter purpose", "New purpose"))
if (!t_purpose || !Adjacent(usr)) return
@@ -126,7 +126,7 @@
transaction_amount += t_amount
price_list += t_amount
playsound(src, 'sound/machines/twobeep.ogg', 25)
src.visible_message("[bicon(src)][transaction_purpose]: [t_amount] Thaler\s.")
src.visible_message("\icon[src][bicon(src)][transaction_purpose]: [t_amount] Thaler\s.")
if("set_amount")
var/item_name = locate(href_list["item"])
var/n_amount = round(tgui_input_number(usr, "Enter amount", "New amount"))
@@ -163,7 +163,7 @@
price_list.Cut()
if("reset_log")
transaction_logs.Cut()
to_chat(usr, "[bicon(src)]<span class='notice'>Transaction log reset.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='notice'>Transaction log reset.</span>")
updateDialog()
@@ -208,7 +208,7 @@
return 1
else
confirm_item = I
src.visible_message("[bicon(src)]<b>Total price:</b> [transaction_amount] Thaler\s. Swipe again to confirm.")
src.visible_message("\icon[src][bicon(src)]<b>Total price:</b> [transaction_amount] Thaler\s. Swipe again to confirm.")
playsound(src, 'sound/machines/twobeep.ogg', 25)
return 0
@@ -219,14 +219,14 @@
if (cash_open)
playsound(src, 'sound/machines/buzz-sigh.ogg', 25)
to_chat(usr, "[bicon(src)]<span class='warning'>The cash box is open.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>The cash box is open.</span>")
return
if((item_list.len > 1 || item_list[item_list[1]] > 1) && !confirm(I))
return
if (!linked_account)
usr.visible_message("[bicon(src)]<span class='warning'>Unable to connect to linked account.</span>")
usr.visible_message("\icon[src][bicon(src)]<span class='warning'>Unable to connect to linked account.</span>")
return
// Access account for transaction
@@ -239,13 +239,13 @@
D = attempt_account_access(I.associated_account_number, attempt_pin, 2)
if(!D)
src.visible_message("[bicon(src)]<span class='warning'>Unable to access account. Check security settings and try again.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='warning'>Unable to access account. Check security settings and try again.</span>")
else
if(D.suspended)
src.visible_message("[bicon(src)]<span class='warning'>Your account has been suspended.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='warning'>Your account has been suspended.</span>")
else
if(transaction_amount > D.money)
src.visible_message("[bicon(src)]<span class='warning'>Not enough funds.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='warning'>Not enough funds.</span>")
else
// Transfer the money
D.money -= transaction_amount
@@ -284,7 +284,7 @@
if (cash_open)
playsound(src, 'sound/machines/buzz-sigh.ogg', 25)
to_chat(usr, "[bicon(src)]<span class='warning'>The cash box is open.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>The cash box is open.</span>")
return
if((item_list.len > 1 || item_list[item_list[1]] > 1) && !confirm(E))
@@ -293,7 +293,7 @@
// Access account for transaction
if(check_account())
if(transaction_amount > E.worth)
src.visible_message("[bicon(src)]<span class='warning'>Not enough funds.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='warning'>Not enough funds.</span>")
else
// Transfer the money
E.worth -= transaction_amount
@@ -322,14 +322,14 @@
if (cash_open)
playsound(src, 'sound/machines/buzz-sigh.ogg', 25)
to_chat(usr, "[bicon(src)]<span class='warning'>The cash box is open.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>The cash box is open.</span>")
return
if((item_list.len > 1 || item_list[item_list[1]] > 1) && !confirm(SC))
return
if(transaction_amount > SC.worth)
src.visible_message("[bicon(src)]<span class='warning'>Not enough money.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='warning'>Not enough money.</span>")
else
// Insert cash into magical slot
SC.worth -= transaction_amount
@@ -351,20 +351,20 @@
/obj/machinery/cash_register/proc/scan_item_price(obj/O)
if(!istype(O)) return
if(item_list.len > 10)
src.visible_message("[bicon(src)]<span class='warning'>Only up to ten different items allowed per purchase.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='warning'>Only up to ten different items allowed per purchase.</span>")
return
if (cash_open)
playsound(src, 'sound/machines/buzz-sigh.ogg', 25)
to_chat(usr, "[bicon(src)]<span class='warning'>The cash box is open.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>The cash box is open.</span>")
return
// First check if item has a valid price
var/price = O.get_item_cost()
if(isnull(price))
src.visible_message("[bicon(src)]<span class='warning'>Unable to find item in database.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='warning'>Unable to find item in database.</span>")
return
// Call out item cost
src.visible_message("[bicon(src)]\A [O]: [price ? "[price] Thaler\s" : "free of charge"].")
src.visible_message("\icon[src][bicon(src)]\A [O]: [price ? "[price] Thaler\s" : "free of charge"].")
// Note the transaction purpose for later use
if(transaction_purpose)
transaction_purpose += "<br>"
@@ -432,11 +432,11 @@
/obj/machinery/cash_register/proc/check_account()
if (!linked_account)
usr.visible_message("[bicon(src)]<span class='warning'>Unable to connect to linked account.</span>")
usr.visible_message("\icon[src][bicon(src)]<span class='warning'>Unable to connect to linked account.</span>")
return 0
if(linked_account.suspended)
src.visible_message("[bicon(src)]<span class='warning'>Connected account has been suspended.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='warning'>Connected account has been suspended.</span>")
return 0
return 1
@@ -444,7 +444,7 @@
/obj/machinery/cash_register/proc/transaction_complete()
/// Visible confirmation
playsound(src, 'sound/machines/chime.ogg', 25)
src.visible_message("[bicon(src)]<span class='notice'>Transaction complete.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='notice'>Transaction complete.</span>")
flick("register_approve", src)
reset_memory()
updateDialog()

34
code/modules/economy/retail_scanner.dm
View File

@@ -99,7 +99,7 @@
if(allowed(usr))
locked = !locked
else
to_chat(usr, "[bicon(src)]<span class='warning'>Insufficient access.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>Insufficient access.</span>")
if("link_account")
var/attempt_account_num = tgui_input_number(usr, "Enter account number", "New account number")
var/attempt_pin = tgui_input_number(usr, "Enter PIN", "Account PIN")
@@ -107,9 +107,9 @@
if(linked_account)
if(linked_account.suspended)
linked_account = null
src.visible_message("[bicon(src)]<span class='warning'>Account has been suspended.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='warning'>Account has been suspended.</span>")
else
to_chat(usr, "[bicon(src)]<span class='warning'>Account not found.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='warning'>Account not found.</span>")
if("custom_order")
var/t_purpose = sanitize(tgui_input_text(usr, "Enter purpose", "New purpose"))
if (!t_purpose || !Adjacent(usr)) return
@@ -120,7 +120,7 @@
transaction_amount += t_amount
price_list += t_amount
playsound(src, 'sound/machines/twobeep.ogg', 25)
src.visible_message("[bicon(src)][transaction_purpose]: [t_amount] Thaler\s.")
src.visible_message("\icon[src][bicon(src)][transaction_purpose]: [t_amount] Thaler\s.")
if("set_amount")
var/item_name = locate(href_list["item"])
var/n_amount = round(tgui_input_number(usr, "Enter amount", "New amount"))
@@ -157,7 +157,7 @@
price_list.Cut()
if("reset_log")
transaction_logs.Cut()
to_chat(usr, "[bicon(src)]<span class='notice'>Transaction log reset.</span>")
to_chat(usr, "\icon[src][bicon(src)]<span class='notice'>Transaction log reset.</span>")
updateDialog()
@@ -190,7 +190,7 @@
return 1
else
confirm_item = I
src.visible_message("[bicon(src)]<b>Total price:</b> [transaction_amount] Thaler\s. Swipe again to confirm.")
src.visible_message("\icon[src][bicon(src)]<b>Total price:</b> [transaction_amount] Thaler\s. Swipe again to confirm.")
playsound(src, 'sound/machines/twobeep.ogg', 25)
return 0
@@ -203,7 +203,7 @@
return
if (!linked_account)
usr.visible_message("[bicon(src)]<span class='warning'>Unable to connect to linked account.</span>")
usr.visible_message("\icon[src][bicon(src)]<span class='warning'>Unable to connect to linked account.</span>")
return
// Access account for transaction
@@ -216,13 +216,13 @@
D = attempt_account_access(I.associated_account_number, attempt_pin, 2)
if(!D)
src.visible_message("[bicon(src)]<span class='warning'>Unable to access account. Check security settings and try again.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='warning'>Unable to access account. Check security settings and try again.</span>")
else
if(D.suspended)
src.visible_message("[bicon(src)]<span class='warning'>Your account has been suspended.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='warning'>Your account has been suspended.</span>")
else
if(transaction_amount > D.money)
src.visible_message("[bicon(src)]<span class='warning'>Not enough funds.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='warning'>Not enough funds.</span>")
else
// Transfer the money
D.money -= transaction_amount
@@ -265,7 +265,7 @@
// Access account for transaction
if(check_account())
if(transaction_amount > E.worth)
src.visible_message("[bicon(src)]<span class='warning'>Not enough funds.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='warning'>Not enough funds.</span>")
else
// Transfer the money
E.worth -= transaction_amount
@@ -291,16 +291,16 @@
/obj/item/device/retail_scanner/proc/scan_item_price(var/obj/O)
if(!istype(O)) return
if(item_list.len > 10)
src.visible_message("[bicon(src)]<span class='warning'>Only up to ten different items allowed per purchase.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='warning'>Only up to ten different items allowed per purchase.</span>")
return
// First check if item has a valid price
var/price = O.get_item_cost()
if(isnull(price))
src.visible_message("[bicon(src)]<span class='warning'>Unable to find item in database.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='warning'>Unable to find item in database.</span>")
return
// Call out item cost
src.visible_message("[bicon(src)]\A [O]: [price ? "[price] Thaler\s" : "free of charge"].")
src.visible_message("\icon[src][bicon(src)]\A [O]: [price ? "[price] Thaler\s" : "free of charge"].")
// Note the transaction purpose for later use
if(transaction_purpose)
transaction_purpose += "<br>"
@@ -368,11 +368,11 @@
/obj/item/device/retail_scanner/proc/check_account()
if (!linked_account)
usr.visible_message("[bicon(src)]<span class='warning'>Unable to connect to linked account.</span>")
usr.visible_message("\icon[src][bicon(src)]<span class='warning'>Unable to connect to linked account.</span>")
return 0
if(linked_account.suspended)
src.visible_message("[bicon(src)]<span class='warning'>Connected account has been suspended.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='warning'>Connected account has been suspended.</span>")
return 0
return 1
@@ -380,7 +380,7 @@
/obj/item/device/retail_scanner/proc/transaction_complete()
/// Visible confirmation
playsound(src, 'sound/machines/chime.ogg', 25)
src.visible_message("[bicon(src)]<span class='notice'>Transaction complete.</span>")
src.visible_message("\icon[src][bicon(src)]<span class='notice'>Transaction complete.</span>")
flick("retail_approve", src)
reset_memory()
updateDialog()

2
code/modules/economy/vending.dm
View File

@@ -270,7 +270,7 @@ GLOBAL_LIST_EMPTY(vending_products)
// This is not a status display message, since it's something the character
// themselves is meant to see BEFORE putting the money in
to_chat(usr, "[bicon(cashmoney)] <span class='warning'>That is not enough money.</span>")
to_chat(usr, "\icon[cashmoney][bicon(cashmoney)] <span class='warning'>That is not enough money.</span>")
return 0
if(istype(cashmoney, /obj/item/weapon/spacecash))

2
code/modules/food/kitchen/icecream.dm
View File

@@ -92,7 +92,7 @@
var/obj/item/weapon/reagent_containers/food/snacks/icecream/I = O
if(!I.ice_creamed)
if(product_types[dispense_flavour] > 0)
src.visible_message("[bicon(src)] <span class='info'>[user] scoops delicious [flavour_name] icecream into [I].</span>")
src.visible_message("\icon[src][bicon(src)] <span class='info'>[user] scoops delicious [flavour_name] icecream into [I].</span>")
product_types[dispense_flavour] -= 1
I.add_ice_cream(flavour_name)
// if(beaker)

12
code/modules/hydroponics/seed_machines.dm
View File

@@ -68,15 +68,15 @@
active = 0
if(failed_task)
failed_task = 0
visible_message("[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("[bicon(src)] [src] pings happily.")
visible_message("\icon[src][bicon(src)] [src] pings happily.")
if(eject_disk)
eject_disk = 0
if(loaded_disk)
loaded_disk.loc = get_turf(src)
visible_message("[bicon(src)] [src] beeps and spits out [loaded_disk].")
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)
@@ -190,7 +190,7 @@
SSplants.seeds[seed.seed.name] = seed.seed
seed.update_seed()
visible_message("[bicon(src)] [src] beeps and spits out [seed].")
visible_message("\icon[src][bicon(src)] [src] beeps and spits out [seed].")
seed = null
return TRUE
@@ -199,7 +199,7 @@
if(!loaded_disk)
return
loaded_disk.forceMove(get_turf(src))
visible_message("[bicon(src)] [src] beeps and spits out [loaded_disk].")
visible_message("\icon[src][bicon(src)] [src] beeps and spits out [loaded_disk].")
loaded_disk = null
return TRUE
@@ -272,7 +272,7 @@
/obj/machinery/botany/editor/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
var/list/data = ..()
data["activity"] = active
if(seed)

2
code/modules/integrated_electronics/subtypes/input.dm
View File

@@ -414,7 +414,7 @@
if(loc)
for(var/mob/O in hearers(1, get_turf(src)))
O.show_message("[bicon(src)] *beep* *beep*", 3, "*beep* *beep*", 2)
O.show_message("\icon[src][bicon(src)] *beep* *beep*", 3, "*beep* *beep*", 2)
/obj/item/integrated_circuit/input/EPv2
name = "\improper EPv2 circuit"

6
code/modules/integrated_electronics/subtypes/output.dm
View File

@@ -43,7 +43,7 @@
var/list/nearby_things = range(0, get_turf(src))
for(var/mob/M in nearby_things)
var/obj/O = assembly ? assembly : src
to_chat(M, "<span class='notice'>[bicon(O)] [stuff_to_display]</span>")
to_chat(M, "<span class='notice'>\icon[O][bicon(O)] [stuff_to_display]</span>")
/obj/item/integrated_circuit/output/screen/large
name = "large screen"
@@ -56,7 +56,7 @@
/obj/item/integrated_circuit/output/screen/large/do_work()
..()
var/obj/O = assembly ? loc : assembly
O.visible_message("<span class='notice'>[bicon(O)] [stuff_to_display]</span>")
O.visible_message("<span class='notice'>\icon[O][bicon(O)] [stuff_to_display]</span>")
/obj/item/integrated_circuit/output/light
name = "light"
@@ -138,7 +138,7 @@
text = get_pin_data(IC_INPUT, 1)
if(!isnull(text))
var/obj/O = assembly ? loc : assembly
audible_message("[bicon(O)] \The [O.name] states, \"[text]\"", runemessage = text)
audible_message("\icon[O][bicon(O)] \The [O.name] states, \"[text]\"", runemessage = text)
/obj/item/integrated_circuit/output/text_to_speech/advanced
name = "advanced text-to-speech circuit"

2
code/modules/mining/drilling/scanner.dm
View File

@@ -51,7 +51,7 @@
if(ore_type) metals[ore_type] += T.resources[metal]
var/message = "[bicon(src)] <span class='notice'>The scanner beeps and displays a readout.</span>"
var/message = "\icon[src][bicon(src)] <span class='notice'>The scanner beeps and displays a readout.</span>"
for(var/ore_type in metals)
var/result = "no sign"

64
code/modules/mob/living/carbon/human/examine.dm
View File

@@ -101,7 +101,7 @@
else if(species.name != "Human")
name_ender = ", <b><font color='[species.get_flesh_colour(src)]'>\a [species.get_examine_name()]!</font></b>[species.get_additional_examine_text(src)]"
var/list/msg = list("<span class='info'>*---------*","This is [bicon(src)] <EM>[src.name]</EM>[name_ender]")
var/list/msg = list("<span class='info'>*---------*","This is \icon[src.examine_icon()][bicon(src)] <EM>[src.name]</EM>[name_ender]")
//uniform
if(w_uniform && !(skip_gear & EXAMINE_SKIPJUMPSUIT) && w_uniform.show_examine)
@@ -136,16 +136,16 @@
tie_msg += " Near the waist it has [english_list(pocket_msg)]."
if(w_uniform.blood_DNA)
msg += "<span class='warning'>[T.He] [T.is] wearing [bicon(w_uniform)] [w_uniform.gender==PLURAL?"some":"a"] [(w_uniform.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [w_uniform.name]![tie_msg]</span>"
msg += "<span class='warning'>[T.He] [T.is] wearing \icon[w_uniform][bicon(w_uniform)] [w_uniform.gender==PLURAL?"some":"a"] [(w_uniform.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [w_uniform.name]![tie_msg]</span>"
else
msg += "[T.He] [T.is] wearing [bicon(w_uniform)] \a [w_uniform].[tie_msg]"
msg += "[T.He] [T.is] wearing \icon[w_uniform][bicon(w_uniform)] \a [w_uniform].[tie_msg]"
//head
if(head && !(skip_gear & EXAMINE_SKIPHELMET) && head.show_examine)
if(head.blood_DNA)
msg += "<span class='warning'>[T.He] [T.is] wearing [bicon(head)] [head.gender==PLURAL?"some":"a"] [(head.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [head.name] on [T.his] head!</span>"
msg += "<span class='warning'>[T.He] [T.is] wearing \icon[head][bicon(head)] [head.gender==PLURAL?"some":"a"] [(head.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [head.name] on [T.his] head!</span>"
else
msg += "[T.He] [T.is] wearing [bicon(head)] \a [head] on [T.his] head."
msg += "[T.He] [T.is] wearing \icon[head][bicon(head)] \a [head] on [T.his] head."
//suit/armour
if(wear_suit)
@@ -156,71 +156,71 @@
tie_msg += " Attached to it is [english_list(U.accessories)]."
if(wear_suit.blood_DNA)
msg += "<span class='warning'>[T.He] [T.is] wearing [bicon(wear_suit)] [wear_suit.gender==PLURAL?"some":"a"] [(wear_suit.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [wear_suit.name][tie_msg]!</span>"
msg += "<span class='warning'>[T.He] [T.is] wearing \icon[wear_suit][bicon(wear_suit)] [wear_suit.gender==PLURAL?"some":"a"] [(wear_suit.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [wear_suit.name][tie_msg]!</span>"
else
msg += "[T.He] [T.is] wearing [bicon(wear_suit)] \a [wear_suit].[tie_msg]"
msg += "[T.He] [T.is] wearing \icon[wear_suit][bicon(wear_suit)] \a [wear_suit].[tie_msg]"
//suit/armour storage
if(s_store && !(skip_gear & EXAMINE_SKIPSUITSTORAGE) && s_store.show_examine)
if(s_store.blood_DNA)
msg += "<span class='warning'>[T.He] [T.is] carrying [bicon(s_store)] [s_store.gender==PLURAL?"some":"a"] [(s_store.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [s_store.name] on [T.his] [wear_suit.name]!</span>"
msg += "<span class='warning'>[T.He] [T.is] carrying \icon[s_store][bicon(s_store)] [s_store.gender==PLURAL?"some":"a"] [(s_store.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [s_store.name] on [T.his] [wear_suit.name]!</span>"
else
msg += "[T.He] [T.is] carrying [bicon(s_store)] \a [s_store] on [T.his] [wear_suit.name]."
msg += "[T.He] [T.is] carrying \icon[s_store][bicon(s_store)] \a [s_store] on [T.his] [wear_suit.name]."
//back
if(back && !(skip_gear & EXAMINE_SKIPBACKPACK) && back.show_examine)
if(back.blood_DNA)
msg += "<span class='warning'>[T.He] [T.has] [bicon(back)] [back.gender==PLURAL?"some":"a"] [(back.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [back] on [T.his] back.</span>"
msg += "<span class='warning'>[T.He] [T.has] \icon[back][bicon(back)] [back.gender==PLURAL?"some":"a"] [(back.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [back] on [T.his] back.</span>"
else
msg += "[T.He] [T.has] [bicon(back)] \a [back] on [T.his] back."
msg += "[T.He] [T.has] \icon[back][bicon(back)] \a [back] on [T.his] back."
//left hand
if(l_hand && l_hand.show_examine)
if(l_hand.blood_DNA)
msg += "<span class='warning'>[T.He] [T.is] holding [bicon(l_hand)] [l_hand.gender==PLURAL?"some":"a"] [(l_hand.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [l_hand.name] in [T.his] left hand!</span>"
msg += "<span class='warning'>[T.He] [T.is] holding \icon[l_hand][bicon(l_hand)] [l_hand.gender==PLURAL?"some":"a"] [(l_hand.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [l_hand.name] in [T.his] left hand!</span>"
else
msg += "[T.He] [T.is] holding [bicon(l_hand)] \a [l_hand] in [T.his] left hand."
msg += "[T.He] [T.is] holding \icon[l_hand][bicon(l_hand)] \a [l_hand] in [T.his] left hand."
//right hand
if(r_hand && r_hand.show_examine)
if(r_hand.blood_DNA)
msg += "<span class='warning'>[T.He] [T.is] holding [bicon(r_hand)] [r_hand.gender==PLURAL?"some":"a"] [(r_hand.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [r_hand.name] in [T.his] right hand!</span>"
msg += "<span class='warning'>[T.He] [T.is] holding \icon[r_hand][bicon(r_hand)] [r_hand.gender==PLURAL?"some":"a"] [(r_hand.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [r_hand.name] in [T.his] right hand!</span>"
else
msg += "[T.He] [T.is] holding [bicon(r_hand)] \a [r_hand] in [T.his] right hand."
msg += "[T.He] [T.is] holding \icon[r_hand][bicon(r_hand)] \a [r_hand] in [T.his] right hand."
//gloves
if(gloves && !(skip_gear & EXAMINE_SKIPGLOVES) && gloves.show_examine)
if(gloves.blood_DNA)
msg += "<span class='warning'>[T.He] [T.has] [bicon(gloves)] [gloves.gender==PLURAL?"some":"a"] [(gloves.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [gloves.name] on [T.his] hands!</span>"
msg += "<span class='warning'>[T.He] [T.has] \icon[gloves][bicon(gloves)] [gloves.gender==PLURAL?"some":"a"] [(gloves.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [gloves.name] on [T.his] hands!</span>"
else
msg += "[T.He] [T.has] [bicon(gloves)] \a [gloves] on [T.his] hands."
msg += "[T.He] [T.has] \icon[gloves][bicon(gloves)] \a [gloves] on [T.his] hands."
else if(blood_DNA && !(skip_body & EXAMINE_SKIPHANDS))
msg += "<span class='warning'>[T.He] [T.has] [(hand_blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained hands!</span>"
//handcuffed?
if(handcuffed && handcuffed.show_examine)
if(istype(handcuffed, /obj/item/weapon/handcuffs/cable))
msg += "<span class='warning'>[T.He] [T.is] [bicon(handcuffed)] restrained with cable!</span>"
msg += "<span class='warning'>[T.He] [T.is] \icon[handcuffed][bicon(handcuffed)] restrained with cable!</span>"
else
msg += "<span class='warning'>[T.He] [T.is] [bicon(handcuffed)] handcuffed!</span>"
msg += "<span class='warning'>[T.He] [T.is] \icon[handcuffed][bicon(handcuffed)] handcuffed!</span>"
//buckled
if(buckled)
msg += "<span class='warning'>[T.He] [T.is] [bicon(buckled)] buckled to [buckled]!</span>"
msg += "<span class='warning'>[T.He] [T.is] \icon[buckled][bicon(buckled)] buckled to [buckled]!</span>"
//belt
if(belt && !(skip_gear & EXAMINE_SKIPBELT) && belt.show_examine)
if(belt.blood_DNA)
msg += "<span class='warning'>[T.He] [T.has] [bicon(belt)] [belt.gender==PLURAL?"some":"a"] [(belt.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [belt.name] about [T.his] waist!</span>"
msg += "<span class='warning'>[T.He] [T.has] \icon[belt][bicon(belt)] [belt.gender==PLURAL?"some":"a"] [(belt.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [belt.name] about [T.his] waist!</span>"
else
msg += "[T.He] [T.has] [bicon(belt)] \a [belt] about [T.his] waist."
msg += "[T.He] [T.has] \icon[belt][bicon(belt)] \a [belt] about [T.his] waist."
//shoes
if(shoes && !(skip_gear & EXAMINE_SKIPSHOES) && shoes.show_examine)
if(shoes.blood_DNA)
msg += "<span class='warning'>[T.He] [T.is] wearing [bicon(shoes)] [shoes.gender==PLURAL?"some":"a"] [(shoes.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [shoes.name] on [T.his] feet!</span>"
msg += "<span class='warning'>[T.He] [T.is] wearing \icon[shoes][bicon(shoes)] [shoes.gender==PLURAL?"some":"a"] [(shoes.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [shoes.name] on [T.his] feet!</span>"
else
msg += "[T.He] [T.is] wearing [bicon(shoes)] \a [shoes] on [T.his] feet."
msg += "[T.He] [T.is] wearing \icon[shoes][bicon(shoes)] \a [shoes] on [T.his] feet."
else if(feet_blood_DNA && !(skip_body & EXAMINE_SKIPHANDS))
msg += "<span class='warning'>[T.He] [T.has] [(feet_blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained feet!</span>"
@@ -231,24 +231,24 @@
descriptor = "in [T.his] mouth"
if(wear_mask.blood_DNA)
msg += "<span class='warning'>[T.He] [T.has] [bicon(wear_mask)] [wear_mask.gender==PLURAL?"some":"a"] [(wear_mask.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [wear_mask.name] [descriptor]!</span>"
msg += "<span class='warning'>[T.He] [T.has] \icon[wear_mask][bicon(wear_mask)] [wear_mask.gender==PLURAL?"some":"a"] [(wear_mask.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [wear_mask.name] [descriptor]!</span>"
else
msg += "[T.He] [T.has] [bicon(wear_mask)] \a [wear_mask] [descriptor]."
msg += "[T.He] [T.has] \icon[wear_mask][bicon(wear_mask)] \a [wear_mask] [descriptor]."
//eyes
if(glasses && !(skip_gear & EXAMINE_SKIPEYEWEAR) && glasses.show_examine)
if(glasses.blood_DNA)
msg += "<span class='warning'>[T.He] [T.has] [bicon(glasses)] [glasses.gender==PLURAL?"some":"a"] [(glasses.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [glasses] covering [T.his] eyes!</span>"
msg += "<span class='warning'>[T.He] [T.has] \icon[glasses][bicon(glasses)] [glasses.gender==PLURAL?"some":"a"] [(glasses.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [glasses] covering [T.his] eyes!</span>"
else
msg += "[T.He] [T.has] [bicon(glasses)] \a [glasses] covering [T.his] eyes."
msg += "[T.He] [T.has] \icon[glasses][bicon(glasses)] \a [glasses] covering [T.his] eyes."
//left ear
if(l_ear && !(skip_gear & EXAMINE_SKIPEARS) && l_ear.show_examine)
msg += "[T.He] [T.has] [bicon(l_ear)] \a [l_ear] on [T.his] left ear."
msg += "[T.He] [T.has] \icon[l_ear][bicon(l_ear)] \a [l_ear] on [T.his] left ear."
//right ear
if(r_ear && !(skip_gear & EXAMINE_SKIPEARS) && r_ear.show_examine)
msg += "[T.He] [T.has] [bicon(r_ear)] \a [r_ear] on [T.his] right ear."
msg += "[T.He] [T.has] \icon[r_ear][bicon(r_ear)] \a [r_ear] on [T.his] right ear."
//ID
if(wear_id && wear_id.show_examine)
@@ -260,9 +260,9 @@
var/obj/item/weapon/card/id/idcard = wear_id
id = idcard.registered_name
if(id && (id != real_name) && (get_dist(src, usr) <= 1) && prob(10))
msg += "<span class='warning'>[T.He] [T.is] wearing [bicon(wear_id)] \a [wear_id] yet something doesn't seem right...</span>"
msg += "<span class='warning'>[T.He] [T.is] wearing \icon[wear_id][bicon(wear_id)] \a [wear_id] yet something doesn't seem right...</span>"
else*/
msg += "[T.He] [T.is] wearing [bicon(wear_id)] \a [wear_id]."
msg += "[T.He] [T.is] wearing \icon[wear_id][bicon(wear_id)] \a [wear_id]."
//Jitters
if(is_jittery)

8
code/modules/mob/living/silicon/pai/software_modules.dm
View File

@@ -140,7 +140,7 @@
/datum/pai_software/med_records/tgui_data(mob/living/silicon/pai/user, datum/tgui/ui, datum/tgui_state/state)
var/list/data = ..()
var/list/records = list()
for(var/datum/data/record/general in sortRecord(data_core.general))
var/list/record = list()
@@ -196,7 +196,7 @@
/datum/pai_software/sec_records/tgui_data(mob/living/silicon/pai/user, datum/tgui/ui, datum/tgui_state/state)
var/list/data = ..()
var/list/records = list()
for(var/datum/data/record/general in sortRecord(data_core.general))
var/list/record = list()
@@ -486,7 +486,7 @@
/datum/pai_software/signaller/tgui_data(mob/living/silicon/pai/user, datum/tgui/ui, datum/tgui_state/state)
var/list/data = ..()
var/obj/item/radio/integrated/signal/R = user.sradio
data["frequency"] = R.frequency
@@ -509,7 +509,7 @@
spawn(0)
R.send_signal("ACTIVATE")
for(var/mob/O in hearers(1, R.loc))
O.show_message("[bicon(R)] *beep* *beep*", 3, "*beep* *beep*", 2)
O.show_message("\icon[R][bicon(R)] *beep* *beep*", 3, "*beep* *beep*", 2)
if("freq")
var/frequency = unformat_frequency(params["freq"])
frequency = sanitize_frequency(frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ)

2
code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm
View File

@@ -83,7 +83,7 @@
if( ishuman(AM) )
if(!stat)
var/mob/M = AM
M.visible_message("<font color='blue'>[bicon(src)] Squeek!</font>")
M.visible_message("<font color='blue'>\icon[src][bicon(src)] Squeek!</font>")
playsound(src, 'sound/effects/mouse_squeak.ogg', 35, 1)
..()

2
code/modules/mob/living/voice/voice.dm
View File

@@ -83,7 +83,7 @@
var/new_name = sanitizeSafe(tgui_input_text(src, "Who would you like to be now?", "Communicator", src.client.prefs.real_name, MAX_NAME_LEN), MAX_NAME_LEN)
if(new_name)
if(comm)
comm.visible_message("<span class='notice'>[bicon(comm)] [src.name] has left, and now you see [new_name].</span>")
comm.visible_message("<span class='notice'>\icon[comm][bicon(comm)] [src.name] has left, and now you see [new_name].</span>")
//Do a bit of logging in-case anyone tries to impersonate other characters for whatever reason.
var/msg = "[src.client.key] ([src]) has changed their communicator identity's name to [new_name]."
message_admins(msg)

2
code/modules/nifsoft/nif.dm
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>\[[bicon(src.big_icon)]NIF\]</b> displays, \"<span class='[alert ? "danger" : "notice"]'>[message]</span>\"")
to_chat(human,"<b>\[\icon[src.big_icon][bicon(src.big_icon)]NIF\]</b> displays, \"<span class='[alert ? "danger" : "notice"]'>[message]</span>\"")
if(prob(1)) human.visible_message("<span class='notice'>\The [human] [pick(look_messages)].</span>")
if(alert)
human << bad_sound

12
code/modules/nifsoft/software/13_soulcatcher.dm
View File

@@ -72,11 +72,11 @@
/datum/nifsoft/soulcatcher/proc/notify_into(var/message)
var/sound = nif.good_sound
to_chat(nif.human,"<b>\[[bicon(nif.big_icon)]NIF\]</b> <b>Soulcatcher</b> displays, \"<span class='notice nif'>[message]</span>\"")
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>\"")
nif.human << sound
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS,"<b>\[[bicon(nif.big_icon)]NIF\]</b> <b>Soulcatcher</b> displays, \"<span class='notice nif'>[message]</span>\"")
to_chat(CS,"<b>\[\icon[nif.big_icon][bicon(nif.big_icon)]NIF\]</b> <b>Soulcatcher</b> displays, \"<span class='notice nif'>[message]</span>\"")
CS << sound
/datum/nifsoft/soulcatcher/proc/say_into(var/message, var/mob/living/sender, var/mob/eyeobj)
@@ -88,9 +88,9 @@
//Not AR Projecting
else
to_chat(nif.human,"<span class='game say nif'><b>\[[bicon(nif.big_icon)]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\"</span>")
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>")
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS,"<span class='game say nif'><b>\[[bicon(nif.big_icon)]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\"</span>")
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>")
log_nsay(message,nif.human.real_name,sender)
@@ -103,9 +103,9 @@
//Not AR Projecting
else
to_chat(nif.human,"<span class='emote nif'><b>\[[bicon(nif.big_icon)]NIF\]</b> <b>[sender_name]</b> [message]</span>")
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>")
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS,"<span class='emote nif'><b>\[[bicon(nif.big_icon)]NIF\]</b> <b>[sender_name]</b> [message]</span>")
to_chat(CS,"<span class='emote 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)

2
code/modules/nifsoft/software/14_commlink.dm
View File

@@ -81,7 +81,7 @@
var/message = combined["formatted"]
var/name_used = M.GetVoice()
var/rendered = null
rendered = "<span class='game say'>[bicon(icon_object)] <span class='name'>[name_used]</span> [message]</span>"
rendered = "<span class='game say'>\icon[icon_object][bicon(icon_object)] <span class='name'>[name_used]</span> [message]</span>"
mob.show_message(rendered, 2)
//Not supported by the internal one

2
code/modules/pda/app.dm
View File

@@ -34,7 +34,7 @@
L = get(pda, /mob/living/silicon)
if(L)
to_chat(L, "[bicon(pda)] [message]")
to_chat(L, "\icon[pda][bicon(pda)] [message]")
SStgui.update_user_uis(L, pda) // Update the receiving user's PDA UI so that they can see the new message
if(!notify_silent)

6
code/modules/pda/messenger.dm
View File

@@ -117,7 +117,7 @@
create_message(usr, P)
if(href_list["target"] in conversations) // Need to make sure the message went through, if not welp.
active_conversation = href_list["target"]
/datum/data/pda/app/messenger/proc/create_message(var/mob/living/U, var/obj/item/device/pda/P)
var/t = tgui_input_text(U, "Please enter message", name, null)
@@ -178,7 +178,7 @@
SStgui.update_user_uis(U, P) // Update the sending user's PDA UI so that they can see the new message
log_pda("(PDA: [src.name]) sent \"[t]\" to [P.name]", usr)
to_chat(U, "[bicon(pda)] <b>Sent message to [P.owner] ([P.ownjob]), </b>\"[t]\"")
to_chat(U, "\icon[pda][bicon(pda)] <b>Sent message to [P.owner] ([P.ownjob]), </b>\"[t]\"")
else
to_chat(U, "<span class='notice'>ERROR: Messaging server is not responding.</span>")
@@ -224,7 +224,7 @@
/datum/data/pda/app/messenger/multicast
/datum/data/pda/app/messenger/multicast/receive_message(list/data, ref)
. = ..()
var/obj/item/device/pda/multicaster/M = pda
if(!istype(M))
return

2
code/modules/pda/pda.dm
View File

@@ -99,7 +99,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
S = 'sound/machines/twobeep.ogg'
playsound(loc, S, 50, 1)
for(var/mob/O in hearers(3, loc))
O.show_message(text("[bicon(src)] *[ttone]*"))
O.show_message(text("\icon[src][bicon(src)] *[ttone]*"))
/obj/item/device/pda/proc/set_ringtone()
var/t = tgui_input_text(usr, "Please enter new ringtone", name, ttone)

2
code/modules/reagents/reactions/_reactions.dm
View File

@@ -119,7 +119,7 @@
var/list/seen = viewers(4, T)
for(var/mob/M in seen)
if(M.client)
M.show_message("<span class='notice'>[bicon(container)] [mix_message]</span>", 1)
M.show_message("<span class='notice'>\icon[container][bicon(container)] [mix_message]</span>", 1)
playsound(T, reaction_sound, 80, 1)
//obtains any special data that will be provided to the reaction products

6
code/modules/research/message_server.dm
View File

@@ -84,7 +84,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
/obj/machinery/message_server/examine(mob/user, distance, infix, suffix)
. = ..()
. += "It appears to be [active ? "online" : "offline"]."
. += "It appears to be [active ? "online" : "offline"]."
/obj/machinery/message_server/proc/GenerateKey()
//Feel free to move to Helpers.
@@ -131,12 +131,12 @@ var/global/list/obj/machinery/message_server/message_servers = list()
if(2)
if(!Console.silent)
playsound(Console, 'sound/machines/twobeep.ogg', 50, 1)
Console.audible_message(text("[bicon(Console)] *The Requests Console beeps: 'PRIORITY Alert in [sender]'"),,5, runemessage = "beep! beep!")
Console.audible_message(text("\icon[Console][bicon(Console)] *The Requests Console beeps: 'PRIORITY Alert in [sender]'"),,5, runemessage = "beep! beep!")
Console.message_log += list(list("High Priority message from [sender]", "[authmsg]"))
else
if(!Console.silent)
playsound(Console, 'sound/machines/twobeep.ogg', 50, 1)
Console.audible_message(text("[bicon(Console)] *The Requests Console beeps: 'Message from [sender]'"),,4, runemessage = "beep beep")
Console.audible_message(text("\icon[Console][bicon(Console)] *The Requests Console beeps: 'Message from [sender]'"),,4, runemessage = "beep beep")
Console.message_log += list(list("Message from [sender]", "[authmsg]"))
Console.set_light(2)

8
code/modules/shieldgen/emergency_shield.dm
View File

@@ -259,14 +259,14 @@
return
if (src.active)
user.visible_message("<font color='blue'>[bicon(src)] [user] deactivated the shield generator.</font>", \
"<font color='blue'>[bicon(src)] You deactivate the shield generator.</font>", \
user.visible_message("<font color='blue'>\icon[src][bicon(src)] [user] deactivated the shield generator.</font>", \
"<font color='blue'>\icon[src][bicon(src)] You deactivate the shield generator.</font>", \
"You hear heavy droning fade out.")
src.shields_down()
else
if(anchored)
user.visible_message("<font color='blue'>[bicon(src)] [user] activated the shield generator.</font>", \
"<font color='blue'>[bicon(src)] You activate the shield generator.</font>", \
user.visible_message("<font color='blue'>\icon[src][bicon(src)] [user] activated the shield generator.</font>", \
"<font color='blue'>\icon[src][bicon(src)] You activate the shield generator.</font>", \
"You hear heavy droning.")
src.shields_up()
else

2
code/modules/shieldgen/shield_capacitor.dm
View File

@@ -49,7 +49,7 @@
else if(W.is_wrench())
src.anchored = !src.anchored
playsound(src, W.usesound, 75, 1)
src.visible_message("<font color='blue'>[bicon(src)] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].</font>")
src.visible_message("<font color='blue'>\icon[src][bicon(src)] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].</font>")
if(anchored)
spawn(0)

8
code/modules/shieldgen/shield_gen.dm
View File

@@ -69,7 +69,7 @@
else if(W.is_wrench())
src.anchored = !src.anchored
playsound(src, W.usesound, 75, 1)
src.visible_message("<font color='blue'>[bicon(src)] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].</font>")
src.visible_message("<font color='blue'>\icon[src][bicon(src)] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].</font>")
if(active)
toggle()
@@ -122,7 +122,7 @@
"failing" = (C.time_since_fail <= 2),
)))
lockedData["capacitors"] = caps
lockedData["active"] = active
lockedData["failing"] = (time_since_fail <= 2)
lockedData["radius"] = field_radius
@@ -242,7 +242,7 @@
covered_turfs = null
for(var/mob/M in view(5,src))
to_chat(M, "[bicon(src)] You hear heavy droning start up.")
to_chat(M, "\icon[src][bicon(src)] You hear heavy droning start up.")
for(var/obj/effect/energy_field/E in field) // Update the icons here to ensure all the shields have been made already.
E.update_icon()
else
@@ -252,7 +252,7 @@
qdel(D)
for(var/mob/M in view(5,src))
to_chat(M, "[bicon(src)] You hear heavy droning fade out.")
to_chat(M, "\icon[src][bicon(src)] You hear heavy droning fade out.")
/obj/machinery/shield_gen/update_icon()
if(stat & BROKEN)

2
code/modules/vchat/vchat_client.dm
View File

@@ -316,7 +316,7 @@ GLOBAL_LIST_EMPTY(bicon_cache) // Cache of the <img> tag results, not the icons
if(use_class)
class = "class='icon [A.icon_state] [custom_classes]'"
return "<img [class] src='data:image/png;base64,[base64]'>"
return "<IMG [class] src='data:image/png;base64,[base64]'>"
//Checks if the message content is a valid to_chat message
/proc/is_valid_tochat_message(message)

2
code/modules/virus2/biohazard destroyer.dm
View File

@@ -17,4 +17,4 @@
I.loc = src.loc
for(var/mob/O in hearers(src, null))
O.show_message("[bicon(src)] <font color='blue'>The [src.name] beeps.</font>", 2)
O.show_message("\icon[src][bicon(src)] <font color='blue'>The [src.name] beeps.</font>", 2)

2
code/modules/virus2/items_devices.dm
View File

@@ -31,7 +31,7 @@
report("Antibodies detected: [antigens2string(C.antibodies)]", user)
/obj/item/device/antibody_scanner/proc/report(var/text, mob/user as mob)
to_chat(user, "<font color='blue'>[bicon(src)] \The [src] beeps,</font> \"<font color='blue'>[text]</font>\"")
to_chat(user, "<font color='blue'>\icon[src][bicon(src)] \The [src] beeps,</font> \"<font color='blue'>[text]</font>\"")
///////////////VIRUS DISH///////////////

4
code/modules/vore/fluffstuff/custom_clothes_vr.dm
View File

@@ -2098,14 +2098,14 @@ Departamental Swimsuits, for general use
translocator_unequip(translocator, user)
T.forceMove(src)
translocator = T
user.show_message("[bicon(src)]*click!*")
user.show_message("\icon[src][bicon(src)]*click!*")
playsound(src, 'sound/machines/click.ogg', 30, 1)
/obj/item/clothing/head/fluff/nikki/proc/translocator_unequip(var/obj/item/device/perfect_tele/T, var/mob/living/carbon/human/user)
if (translocator)
if (user)
user.put_in_hands(T)
user.show_message("[bicon(src)]*click!*")
user.show_message("\icon[src][bicon(src)]*click!*")
else
translocator.forceMove(get_turf(src))
translocator = null

8
code/modules/xenoarcheaology/artifacts/autocloner.dm
View File

@@ -46,17 +46,17 @@
if(!previous_power_state)
previous_power_state = 1
icon_state = "cellold1"
src.visible_message("<span class='notice'>[bicon(src)] [src] suddenly comes to life!</span>")
src.visible_message("<span class='notice'>\icon[src][bicon(src)] [src] suddenly comes to life!</span>")
//slowly grow a mob
if(prob(5))
src.visible_message("<span class='notice'>[bicon(src)] [src] [pick("gloops","glugs","whirrs","whooshes","hisses","purrs","hums","gushes")].</span>")
src.visible_message("<span class='notice'>\icon[src][bicon(src)] [src] [pick("gloops","glugs","whirrs","whooshes","hisses","purrs","hums","gushes")].</span>")
//if we've finished growing...
if(time_spent_spawning >= time_per_spawn)
time_spent_spawning = 0
update_use_power(USE_POWER_IDLE)
src.visible_message("<span class='notice'>[bicon(src)] [src] pings!</span>")
src.visible_message("<span class='notice'>\icon[src][bicon(src)] [src] pings!</span>")
icon_state = "cellold1"
desc = "It's full of a bubbling viscous liquid, and is lit by a mysterious glow."
if(spawn_type)
@@ -77,7 +77,7 @@
if(previous_power_state)
previous_power_state = 0
icon_state = "cellold0"
src.visible_message("<span class='notice'>[bicon(src)] [src] suddenly shuts down.</span>")
src.visible_message("<span class='notice'>\icon[src][bicon(src)] [src] suddenly shuts down.</span>")
//cloned mob slowly breaks down
time_spent_spawning = max(time_spent_spawning + last_process - world.time, 0)

10
code/modules/xenoarcheaology/artifacts/replicator.dm
View File

@@ -98,7 +98,7 @@
"foreground" = colors[color],
)))
fail_message = "<font color='blue'>[bicon(src)] a [pick("loud","soft","sinister","eery","triumphant","depressing","cheerful","angry")] \
fail_message = "<font color='blue'>\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")] \
@@ -110,7 +110,7 @@
if(spawning_types.len && powered())
spawn_progress_time += world.time - last_process_time
if(spawn_progress_time > max_spawn_time)
src.visible_message("<span class='notice'>[bicon(src)] [src] pings!</span>")
src.visible_message("<span class='notice'>\icon[src][bicon(src)] [src] pings!</span>")
var/obj/source_material = pop(stored_materials)
var/spawn_type = pop(spawning_types)
@@ -133,7 +133,7 @@
icon_state = "borgcharger0(old)"
else if(prob(5))
src.visible_message("<span class='notice'>[bicon(src)] [src] [pick("clicks","whizzes","whirrs","whooshes","clanks","clongs","clonks","bangs")].</span>")
src.visible_message("<span class='notice'>\icon[src][bicon(src)] [src] [pick("clicks","whizzes","whirrs","whooshes","clanks","clongs","clonks","bangs")].</span>")
last_process_time = world.time
@@ -161,9 +161,9 @@
if(key in construction)
if(LAZYLEN(stored_materials) > LAZYLEN(spawning_types))
if(LAZYLEN(spawning_types))
visible_message("<span class='notice'>[bicon(src)] a [pick("light","dial","display","meter","pad")] on [src]'s front [pick("blinks","flashes")] [pick("red","yellow","blue","orange","purple","green","white")].</span>")
visible_message("<span class='notice'>\icon[src][bicon(src)] a [pick("light","dial","display","meter","pad")] on [src]'s front [pick("blinks","flashes")] [pick("red","yellow","blue","orange","purple","green","white")].</span>")
else
visible_message("<span class='notice'>[bicon(src)] [src]'s front compartment slides shut.</span>")
visible_message("<span class='notice'>\icon[src][bicon(src)] [src]'s front compartment slides shut.</span>")
spawning_types.Add(construction[key])
spawn_progress_time = 0
update_use_power(USE_POWER_ACTIVE)

2
code/modules/xenoarcheaology/effect.dm
View File

@@ -92,7 +92,7 @@
var/atom/toplevelholder = target
while(!istype(toplevelholder.loc, /turf))
toplevelholder = toplevelholder.loc
toplevelholder.visible_message("<font color='red'>[bicon(toplevelholder)] [toplevelholder] [display_msg]</font>")
toplevelholder.visible_message("<font color='red'>\icon[toplevelholder][bicon(toplevelholder)] [toplevelholder] [display_msg]</font>")
/datum/artifact_effect/proc/DoEffectTouch(var/mob/user)
/datum/artifact_effect/proc/DoEffectAura(var/atom/holder)

2
code/modules/xenoarcheaology/finds/fossils.dm
View File

@@ -77,7 +77,7 @@
..()
else if(istype(W,/obj/item/weapon/pen))
plaque_contents = sanitize(tgui_input_text(usr, "What would you like to write on the plaque:","Skeleton plaque",""))
user.visible_message("[user] writes something on the base of [src].","You relabel the plaque on the base of [bicon(src)] [src].")
user.visible_message("[user] writes something on the base of [src].","You relabel the plaque on the base of \icon[src][bicon(src)] [src].")
if(src.contents.Find(/obj/item/weapon/fossil/skull/horned))
src.desc = "A creature made of [src.contents.len-1] assorted bones and a horned skull. The plaque reads \'[plaque_contents]\'."
else

2
code/modules/xenoarcheaology/finds/special.dm
View File

@@ -99,7 +99,7 @@
if(charges >= 0.1)
if(prob(5))
src.visible_message("<font color='red'>[bicon(src)] [src]'s eyes glow ruby red for a moment!</font>")
src.visible_message("<font color='red'>\icon[src][bicon(src)] [src]'s eyes glow ruby red for a moment!</font>")
charges -= 0.1
//check on our shadow wights

4
code/modules/xenoarcheaology/finds/talking.dm
View File

@@ -54,7 +54,7 @@
var/list/options = list("[holder_atom] seems to be listening intently to [source]...",\
"[holder_atom] seems to be focusing on [source]...",\
"[holder_atom] seems to turn it's attention to [source]...")
holder_atom.loc.visible_message("<font color='blue'>[bicon(holder_atom)] [pick(options)]</font>")
holder_atom.loc.visible_message("<font color='blue'>\icon[holder_atom][bicon(holder_atom)] [pick(options)]</font>")
if(prob(20))
spawn(2)
@@ -118,5 +118,5 @@
listening|=M
for(var/mob/M in listening)
to_chat(M, "[bicon(holder_atom)] <b>[holder_atom]</b> reverberates, \"<font color='blue'>[msg]</font>\"")
to_chat(M, "\icon[holder_atom][bicon(holder_atom)] <b>[holder_atom]</b> reverberates, \"<font color='blue'>[msg]</font>\"")
last_talk_time = world.time

14
code/modules/xenoarcheaology/tools/ano_device_battery.dm
View File

@@ -67,7 +67,7 @@
/obj/item/weapon/anodevice/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
var/list/data = ..()
data["inserted_battery"] = inserted_battery
data["anomaly"] = null
data["charge"] = null
@@ -103,7 +103,7 @@
if("startup")
if(inserted_battery && inserted_battery.battery_effect && (inserted_battery.stored_charge > 0))
activated = TRUE
visible_message("<font color='blue'>[bicon(src)] [src] whirrs.</font>", "[bicon(src)]<font color='blue'>You hear something whirr.</font>")
visible_message("<font color='blue'>\icon[src][bicon(src)] [src] whirrs.</font>", "\icon[src][bicon(src)]<font color='blue'>You hear something whirr.</font>")
if(!inserted_battery.battery_effect.activated)
inserted_battery.battery_effect.ToggleActivate(1)
time_end = world.time + duration
@@ -146,9 +146,9 @@
if(interval > 0)
//apply the touch effect to the holder
if(holder)
to_chat(holder, "the [bicon(src)] [src] held by [holder] shudders in your grasp.")
to_chat(holder, "the \icon[src][bicon(src)] [src] held by [holder] shudders in your grasp.")
else
src.loc.visible_message("the [bicon(src)] [src] shudders.")
src.loc.visible_message("the \icon[src][bicon(src)] [src] shudders.")
//consume power
inserted_battery.use_power(energy_consumed_on_touch)
@@ -175,13 +175,13 @@
//work out if we need to shutdown
if(inserted_battery.stored_charge <= 0)
src.loc.visible_message("<font color='blue'>[bicon(src)] [src] buzzes.</font>", "<font color='blue'>[bicon(src)] You hear something buzz.</font>")
src.loc.visible_message("<font color='blue'>\icon[src][bicon(src)] [src] buzzes.</font>", "<font color='blue'>\icon[src][bicon(src)] You hear something buzz.</font>")
shutdown_emission()
else if(world.time > time_end)
src.loc.visible_message("<font color='blue'>[bicon(src)] [src] chimes.</font>", "<font color='blue'>[bicon(src)] You hear something chime.</font>")
src.loc.visible_message("<font color='blue'>\icon[src][bicon(src)] [src] chimes.</font>", "<font color='blue'>\icon[src][bicon(src)] You hear something chime.</font>")
shutdown_emission()
else
src.visible_message("<font color='blue'>[bicon(src)] [src] buzzes.</font>", "<font color='blue'>[bicon(src)] You hear something buzz.</font>")
src.visible_message("<font color='blue'>\icon[src][bicon(src)] [src] buzzes.</font>", "<font color='blue'>\icon[src][bicon(src)] You hear something buzz.</font>")
shutdown_emission()
last_process = world.time

2
code/modules/xenoarcheaology/tools/artifact_analyser.dm
View File

@@ -125,7 +125,7 @@
P.name = "[src] report #[++report_num]"
P.info = "<b>[src] analysis report #[report_num]</b><br>"
P.info += "<br>"
P.info += "[bicon(scanned_object)] [results]"
P.info += "\icon[scanned_object][bicon(scanned_object)] [results]"
P.stamped = list(/obj/item/weapon/stamp)
P.add_overlay("paper_stamped")

10
code/modules/xenoarcheaology/tools/geosample_scanner.dm
View File

@@ -126,7 +126,7 @@
/obj/machinery/radiocarbon_spectrometer/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
var/list/data = ..()
// this is the data which will be sent to the ui
data["scanned_item"] = (scanned_item ? scanned_item.name : "")
data["scanned_item_desc"] = (scanned_item ? (scanned_item.desc ? scanned_item.desc : "No information on record.") : "")
@@ -268,16 +268,16 @@
//emergency stop if seal integrity reaches 0
if(scanner_seal_integrity <= 0 || (scanner_temperature >= 1273 && !rad_shield))
stop_scanning()
src.visible_message("<font color='blue'>[bicon(src)] buzzes unhappily. It has failed mid-scan!</font>", 2)
src.visible_message("<font color='blue'>\icon[src][bicon(src)] buzzes unhappily. It has failed mid-scan!</font>", 2)
if(prob(5))
src.visible_message("<font color='blue'>[bicon(src)] [pick("whirrs","chuffs","clicks")][pick(" excitedly"," energetically"," busily")].</font>", 2)
src.visible_message("<font color='blue'>\icon[src][bicon(src)] [pick("whirrs","chuffs","clicks")][pick(" excitedly"," energetically"," busily")].</font>", 2)
else
//gradually cool down over time
if(scanner_temperature > 0)
scanner_temperature = max(scanner_temperature - 5 - 10 * rand(), 0)
if(prob(0.75))
src.visible_message("<font color='blue'>[bicon(src)] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")].</font>", 2)
src.visible_message("<font color='blue'>\icon[src][bicon(src)] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")].</font>", 2)
playsound(src, 'sound/effects/ding.ogg', 25)
last_process_worldtime = world.time
@@ -296,7 +296,7 @@
used_coolant = 0
/obj/machinery/radiocarbon_spectrometer/proc/complete_scan()
src.visible_message("<font color='blue'>[bicon(src)] makes an insistent chime.</font>", 2)
src.visible_message("<font color='blue'>\icon[src][bicon(src)] makes an insistent chime.</font>", 2)
if(scanned_item)
//create report

8
code/modules/xenoarcheaology/tools/suspension_generator.dm
View File

@@ -147,10 +147,10 @@
for(var/mob/living/M in T)
M.Weaken(5)
M.visible_message("<span class='notice'>[bicon(M)] [M] begins to float in the air!</span>","You feel tingly and light, but it is difficult to move.")
M.visible_message("<span class='notice'>\icon[M][bicon(M)] [M] begins to float in the air!</span>","You feel tingly and light, but it is difficult to move.")
suspension_field = new(T)
visible_message("<span class='notice'>[bicon(src)] [src] activates with a low hum.</span>")
visible_message("<span class='notice'>\icon[src][bicon(src)] [src] activates with a low hum.</span>")
icon_state = "suspension3"
for(var/obj/item/I in T)
@@ -160,7 +160,7 @@
if(collected)
suspension_field.icon_state = "energynet"
suspension_field.add_overlay("shield2")
visible_message("<span class='notice'>[bicon(suspension_field)] [suspension_field] gently absconds [collected > 1 ? "something" : "several things"].</span>")
visible_message("<span class='notice'>\icon[suspension_field][bicon(suspension_field)] [suspension_field] gently absconds [collected > 1 ? "something" : "several things"].</span>")
else
if(istype(T,/turf/simulated/mineral) || istype(T,/turf/simulated/wall))
suspension_field.icon_state = "shieldsparkles"
@@ -175,7 +175,7 @@
to_chat(M, "<span class='notice'>You no longer feel like floating.</span>")
M.Weaken(3)
visible_message("<span class='notice'>[bicon(src)] [src] deactivates with a gentle shudder.</span>")
visible_message("<span class='notice'>\icon[src][bicon(src)] [src] deactivates with a gentle shudder.</span>")
qdel(suspension_field)
suspension_field = null
icon_state = "suspension2"

10
code/modules/xenoarcheaology/tools/tools.dm
View File

@@ -131,7 +131,7 @@
positive_locations.Add(D)
to_chat(user, "<span class='notice'>[bicon(src)] [src] pings.</span>")
to_chat(user, "<span class='notice'>\icon[src][bicon(src)] [src] pings.</span>")
else if(istype(A, /obj/structure/boulder))
var/obj/structure/boulder/B = A
@@ -149,7 +149,7 @@
positive_locations.Add(D)
to_chat(user, "<span class='notice'>[bicon(src)] [src] pings [pick("madly","wildly","excitedly","crazily")]!</span>")
to_chat(user, "<span class='notice'>\icon[src][bicon(src)] [src] pings [pick("madly","wildly","excitedly","crazily")]!</span>")
/obj/item/device/depth_scanner/attack_self(var/mob/living/user)
tgui_interact(user)
@@ -197,7 +197,7 @@
if(..())
return TRUE
switch(action)
switch(action)
if("select")
var/index = text2num(params["select"])
if(index && index <= LAZYLEN(positive_locations))
@@ -269,9 +269,9 @@
scan_ticks = 0
var/turf/T = get_turf(src)
if(target_radio)
T.visible_message("[bicon(src)] [src] [pick("chirps","chirrups","cheeps")] happily.")
T.visible_message("\icon[src][bicon(src)] [src] [pick("chirps","chirrups","cheeps")] happily.")
else
T.visible_message("[bicon(src)] [src] [pick("chirps","chirrups","cheeps")] sadly.")
T.visible_message("\icon[src][bicon(src)] [src] [pick("chirps","chirrups","cheeps")] sadly.")
else
icon_state = "pinoff"

2
code/modules/xenobio/items/extracts.dm
View File

@@ -55,7 +55,7 @@
var/obj/item/slime_extract/T = holder.my_atom
T.uses--
if(T.uses <= 0)
T.visible_message("[bicon(T)]<b>\The [T]</b> goes inert.")
T.visible_message("\icon[T][bicon(T)]<b>\The [T]</b> goes inert.")
T.name = "inert [initial(T.name)]"

2
code/modules/xenobio/items/extracts_vr.dm
View File

@@ -60,7 +60,7 @@
var/obj/item/slime_extract/T = holder.my_atom
T.uses--
if(T.uses <= 0)
T.visible_message("[bicon(T)]<b>\The [T]</b> goes inert.")
T.visible_message("\icon[T][bicon(T)]<b>\The [T]</b> goes inert.")
T.name = "inert [initial(T.name)]"

2
code/modules/xenobio2/machinery/core_extractor.dm
View File

@@ -93,7 +93,7 @@
/obj/machinery/slime/extractor/proc/extract_cores()
if(!src.occupant)
src.visible_message("[bicon(src)] [src] pings unhappily.")
src.visible_message("\icon[src][bicon(src)] [src] pings unhappily.")
else if(inuse)
return

12
code/modules/xenobio2/machinery/gene_manipulators.dm
View File

@@ -102,15 +102,15 @@
in_use = 0
if(failed_task)
failed_task = 0
visible_message("[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("[bicon(src)] [src] pings happily.")
visible_message("\icon[src][bicon(src)] [src] pings happily.")
if(eject_disk)
eject_disk = 0
if(loaded_disk)
loaded_disk.forceMove(get_turf(src))
visible_message("[bicon(src)] [src] beeps and spits out [loaded_disk].")
visible_message("\icon[src][bicon(src)] [src] beeps and spits out [loaded_disk].")
loaded_disk = null
/obj/machinery/xenobio/extractor
@@ -126,7 +126,7 @@
/obj/machinery/xenobio/extractor/Initialize()
. = ..()
default_apply_parts()
/obj/machinery/xenobio/extractor/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/xenoproduct))
if(product)
@@ -183,7 +183,7 @@
/obj/machinery/xenobio/proc/eject_disk()
if(!loaded_disk) return
loaded_disk.forceMove(loc)
visible_message("[bicon(src)] [src] beeps and spits out [loaded_disk].")
visible_message("\icon[src][bicon(src)] [src] beeps and spits out [loaded_disk].")
loaded_disk = null
/obj/machinery/xenobio/extractor/Topic(href, href_list)
@@ -195,7 +195,7 @@
if(!product) return
product.forceMove(get_turf(src))
visible_message("[bicon(src)] [src] beeps and spits out [product].")
visible_message("\icon[src][bicon(src)] [src] beeps and spits out [product].")
product = null
if(href_list["eject_disk"])

2
code/modules/xenobio2/machinery/slime_replicator.dm
View File

@@ -57,7 +57,7 @@
/obj/machinery/slime/replicator/proc/replicate_slime()
if(!src.core)
src.visible_message("[bicon(src)] [src] pings unhappily.")
src.visible_message("\icon[src][bicon(src)] [src] pings unhappily.")
else if(inuse)
return