refactors most spans

This commit is contained in:
Kashargul
2024-10-02 21:10:31 +02:00
parent 5417c7772c
commit a2c673ab7a
1517 changed files with 12436 additions and 12347 deletions
+18 -18
View File
@@ -211,7 +211,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
if(human)
notify("Danger! General system insta#^!($",TRUE)
to_chat(human,"<span class='danger'>Your NIF vision overlays disappear and your head suddenly seems very quiet...</span>")
to_chat(human,span_danger("Your NIF vision overlays disappear and your head suddenly seems very quiet..."))
//Repair update/check proc
/obj/item/nif/proc/repair(var/repair = 0)
@@ -224,33 +224,33 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
/obj/item/nif/attackby(obj/item/W, mob/user as mob)
if(open == 0 && W.has_tool_quality(TOOL_SCREWDRIVER))
if(do_after(user, 4 SECONDS, src) && open == 0)
user.visible_message("[user] unscrews and pries open \the [src].","<span class='notice'>You unscrew and pry open \the [src].</span>")
user.visible_message("[user] unscrews and pries open \the [src].",span_notice("You unscrew and pry open \the [src]."))
playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
open = 1
update_icon()
else if(open == 1 && istype(W,/obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = W
if(C.get_amount() < 3)
to_chat(user,"<span class='warning'>You need at least three coils of wire to add them to \the [src].</span>")
to_chat(user,span_warning("You need at least three coils of wire to add them to \the [src]."))
return
if(durability >= initial(durability))
to_chat(user,"<span class='notice'>There's no damaged wiring that needs replacing!</span>")
to_chat(user,span_notice("There's no damaged wiring that needs replacing!"))
open = 3
update_icon()
return
if(do_after(user, 6 SECONDS, src) && open == 1 && C.use(3))
user.visible_message("[user] replaces some wiring in \the [src].","<span class='notice'>You replace any burned out wiring in \the [src].</span>")
user.visible_message("[user] replaces some wiring in \the [src].",span_notice("You replace any burned out wiring in \the [src]."))
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
open = 2
update_icon()
else if(open == 2 && istype(W,/obj/item/multitool))
if(do_after(user, 8 SECONDS, src) && open == 2)
user.visible_message("[user] resets several circuits in \the [src].","<span class='notice'>You find and repair any faulty circuits in \the [src].</span>")
user.visible_message("[user] resets several circuits in \the [src].",span_notice("You find and repair any faulty circuits in \the [src]."))
open = 3
update_icon()
else if(open == 3 && W.has_tool_quality(TOOL_SCREWDRIVER))
if(do_after(user, 3 SECONDS, src) && open == 3)
user.visible_message("[user] closes up \the [src].","<span class='notice'>You re-seal \the [src] for use once more.</span>")
user.visible_message("[user] closes up \the [src].",span_notice("You re-seal \the [src] for use once more."))
playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
open = FALSE
repair(initial(durability))
@@ -325,10 +325,10 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
human.custom_pain(message,35)
if(2)
human.Weaken(5)
to_chat(human,"<span class='danger'>A wave of weakness rolls over you.</span>")
to_chat(human,span_danger("A wave of weakness rolls over you."))
/*if(3)
human.Sleeping(5) //Disabled for being boring
to_chat(human,"<span class='danger'>You suddenly black out!</span>")*/
to_chat(human,span_danger("You suddenly black out!"))*/
//Finishing up
if(1.0 to INFINITY)
@@ -387,8 +387,8 @@ 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,"<span class='filter_nif'><b>\[[icon2html(src.big_icon, human.client)]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>")
to_chat(human,span_filter_nif("<b>\[[icon2html(src.big_icon, human.client)]NIF\]</b> displays, " + alert ? span_danger(message) : span_notice(message)))
if(prob(1)) human.visible_message(span_notice("\The [human] [pick(look_messages)]."))
if(alert)
human << bad_sound
else
@@ -488,7 +488,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
if(stat != NIF_WORKING) return FALSE
if(human)
if(prob(5)) human.visible_message("<span class='notice'>\The [human] [pick(look_messages)].</span>")
if(prob(5)) human.visible_message(span_notice("\The [human] [pick(look_messages)]."))
var/applies_to = soft.applies_to
var/synth = human.isSynthetic()
if(synth && !(applies_to & NIF_SYNTHETIC))
@@ -515,7 +515,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
//Deactivate a nifsoft
/obj/item/nif/proc/deactivate(var/datum/nifsoft/soft)
if(human)
if(prob(5)) human.visible_message("<span class='notice'>\The [human] [pick(look_messages)].</span>")
if(prob(5)) human.visible_message(span_notice("\The [human] [pick(look_messages)]."))
human << click_sound
if(soft.tick_flags == NIF_ACTIVETICK)
@@ -667,14 +667,14 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
if(istype(T.species,/datum/species/shapeshifter/promethean) && target_zone == BP_TORSO)
if(T.w_uniform || T.wear_suit)
to_chat(user,"<span class='warning'>Remove any clothing they have on, as it might interfere!</span>")
to_chat(user,span_warning("Remove any clothing they have on, as it might interfere!"))
return
var/obj/item/organ/external/eo = T.get_organ(BP_TORSO)
if(!T)
to_chat(user,"<span class='warning'>They should probably regrow their torso first.</span>")
to_chat(user,span_warning("They should probably regrow their torso first."))
return
U.visible_message("<span class='notice'>[U] begins installing [src] into [T]'s chest by just stuffing it in.</span>",
"<span class='notice'>You begin installing [src] into [T]'s chest by just stuffing it in.</span>",
U.visible_message(span_notice("[U] begins installing [src] into [T]'s chest by just stuffing it in."),
span_notice("You begin installing [src] into [T]'s chest by just stuffing it in."),
"There's a wet SQUISH noise.")
if(do_mob(user = user, target = T, time = 200, target_zone = BP_TORSO))
user.unEquip(src)
@@ -692,7 +692,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
if(!nif)
verbs -= /mob/living/carbon/human/proc/set_nif_examine
to_chat(src,"<span class='warning'>You don't have a NIF, not sure why this was here.</span>")
to_chat(src,span_warning("You don't have a NIF, not sure why this was here."))
return
var/new_flavor = sanitize(tgui_input_text(src,"Describe how your NIF alters your appearance, like glowy eyes or metal plate on your head, etc. Be sensible. Clear this for no examine text. 128ch max.","Describe NIF", nif.examine_msg, 128), max_length = 128)
+8 -8
View File
@@ -102,21 +102,21 @@
var/datum/nifsoft/path = R.item_path
if(!ishuman(user))
return FALSE
var/mob/living/carbon/human/H = user
if(!H.nif || !H.nif.stat == NIF_WORKING)
to_chat(H, "<span class='warning'>[src] seems unable to connect to your NIF...</span>")
to_chat(H, span_warning("[src] seems unable to connect to your NIF..."))
return FALSE
if(!H.nif.can_install(path))
flick("[icon_state]-deny", entopic.my_image)
return FALSE
if(initial(path.access))
var/list/soft_access = list(initial(path.access))
var/list/usr_access = user.GetAccess()
if(scan_id && !has_access(soft_access, list(), usr_access) && !emagged)
to_chat(user, "<span class='warning'>You aren't authorized to buy [initial(path.name)].</span>")
to_chat(user, span_warning("You aren't authorized to buy [initial(path.name)]."))
flick("[icon_state]-deny", entopic.my_image)
return FALSE
@@ -124,7 +124,7 @@
/obj/machinery/vending/nifsoft_shop/vend(datum/stored_item/vending_product/R, mob/user)
var/mob/living/carbon/human/H = user
if(!can_buy(R, user)) //For SECURE VENDING MACHINES YEAH
to_chat(user, "<span class='warning'>Purchase not allowed.</span>") //Unless emagged of course
to_chat(user, span_warning("Purchase not allowed.")) //Unless emagged of course
flick("[icon_state]-deny",entopic.my_image)
return
vend_ready = 0 //One thing at a time!!
@@ -132,13 +132,13 @@
if(R.category & CAT_COIN)
if(!coin)
to_chat(user, "<span class='notice'>You need to insert a coin to get this item.</span>")
to_chat(user, span_notice("You need to insert a coin to get this item."))
return
if(coin.string_attached)
if(prob(50))
to_chat(user, "<span class='notice'>You successfully pull the coin out before \the [src] could swallow it.</span>")
to_chat(user, span_notice("You successfully pull the coin out before \the [src] could swallow it."))
else
to_chat(user, "<span class='notice'>You weren't able to pull the coin out fast enough, the machine ate it, string and all.</span>")
to_chat(user, span_notice("You weren't able to pull the coin out fast enough, the machine ate it, string and all."))
qdel(coin)
coin = null
categories &= ~CAT_COIN
+6 -6
View File
@@ -209,14 +209,14 @@
var/mob/living/carbon/human/Hu = user
if(!Ht.nif || Ht.nif.stat != NIF_WORKING)
to_chat(user,"<span class='warning'>Either they don't have a NIF, or the uploader can't connect.</span>")
to_chat(user,span_warning("Either they don't have a NIF, or the uploader can't connect."))
return
var/extra = extra_params()
if(A == user)
to_chat(user,"<span class='notice'>You upload [src] into your NIF.</span>")
to_chat(user,span_notice("You upload [src] into your NIF."))
else
Ht.visible_message("<span class='warning'>[Hu] begins uploading [src] into [Ht]!</span>","<span class='danger'>[Hu] is uploading [src] into you!</span>")
Ht.visible_message(span_warning("[Hu] begins uploading [src] into [Ht]!"),span_danger("[Hu] is uploading [src] into you!"))
icon_state = "[initial(icon_state)]-animate" //makes it play the item animation upon using on a valid target
update_icon()
@@ -262,7 +262,7 @@
if(!ishuman(A))
return
if(!laws)
to_chat(user,"<span class='warning'>You haven't set any laws yet. Use the disk in-hand first.</span>")
to_chat(user,span_warning("You haven't set any laws yet. Use the disk in-hand first."))
return
..(A,user,flag,params)
@@ -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,"<span class='filter_notice'>You set the laws to: <br><span class='notice'>[newlaws]</span></span>")
to_chat(user,span_filter_notice("You set the laws to: <br><span class='notice'>[newlaws]</span>"))
laws = newlaws
/obj/item/disk/nifsoft/compliance/extra_params()
@@ -403,4 +403,4 @@
/obj/item/storage/box/nifsofts_sizechange/New()
..()
for(var/i = 0 to 7)
new /obj/item/disk/nifsoft/sizechange(src)
new /obj/item/disk/nifsoft/sizechange(src)
+14 -14
View File
@@ -74,13 +74,13 @@
to_chat(nif.human,
type = MESSAGE_TYPE_NIF,
html = "<span class='nif'><b>\[[icon2html(nif.big_icon, nif.human)]NIF\]</b> <b>Soulcatcher</b> displays, \"<span class='notice nif'>[message]</span>\"</span>")
html = span_nif("<b>\[[icon2html(nif.big_icon, nif.human)]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,
type = MESSAGE_TYPE_NIF,
html = "<span class='nif'><b>\[[icon2html(nif.big_icon, CS.client)]NIF\]</b> <b>Soulcatcher</b> displays, \"<span class='notice nif'>[message]</span>\"</span>")
html = span_nif("<b>\[[icon2html(nif.big_icon, CS.client)]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,17 +88,17 @@
//AR Projecting
if(eyeobj)
sender.eyeobj.visible_message("<span class='game say'><b>[sender_name]</b> says, \"[message]\"</span>")
sender.eyeobj.visible_message(span_game(span_say("<b>[sender_name]</b> says, \"[message]\"")))
//Not AR Projecting
else
to_chat(nif.human,
type = MESSAGE_TYPE_NIF,
html = "<span class='nif'><b>\[[icon2html(nif.big_icon, nif.human.client)]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\"</span>")
html = span_nif("<b>\[[icon2html(nif.big_icon, nif.human.client)]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\""))
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS,
type = MESSAGE_TYPE_NIF,
html = "<span class='nif'><b>\[[icon2html(nif.big_icon, CS.client)]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\"</span>")
html = span_nif("<b>\[[icon2html(nif.big_icon, CS.client)]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\""))
log_nsay(message,nif.human.real_name,sender)
@@ -107,17 +107,17 @@
//AR Projecting
if(eyeobj)
sender.eyeobj.visible_message("<span class='emote'>[sender_name] [message]</span>")
sender.eyeobj.visible_message(span_emote("[sender_name] [message]"))
//Not AR Projecting
else
to_chat(nif.human,
type = MESSAGE_TYPE_NIF,
html = "<span class='nif'><b>\[[icon2html(nif.big_icon,nif.human.client)]NIF\]</b> <b>[sender_name]</b> [message]</span>")
html = span_nif("<b>\[[icon2html(nif.big_icon,nif.human.client)]NIF\]</b> <b>[sender_name]</b> [message]"))
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS,
type = MESSAGE_TYPE_NIF,
html = "<span class='nif'><b>\[[icon2html(nif.big_icon,CS.client)]NIF\]</b> <b>[sender_name]</b> [message]</span>")
html = span_nif("<b>\[[icon2html(nif.big_icon,CS.client)]NIF\]</b> <b>[sender_name]</b> [message]"))
log_nme(message,nif.human.real_name,sender)
@@ -380,7 +380,7 @@
return
if (src.client)
if (client.prefs.muted & MUTE_IC)
to_chat(src, "<span class='warning'>You cannot send IC messages (muted).</span>")
to_chat(src, span_warning("You cannot send IC messages (muted)."))
return
if (stat)
return
@@ -398,7 +398,7 @@
set name = "Resist"
set category = "IC"
to_chat(src,"<span class='warning'>There's no way out! You're stuck in VR.</span>")
to_chat(src,span_warning("There's no way out! You're stuck in VR."))
///////////////////
//A projected AR soul thing
@@ -553,11 +553,11 @@
set category = "Soulcatcher"
if(eyeobj)
to_chat(src,"<span class='warning'>You're already projecting in AR!</span>")
to_chat(src,span_warning("You're already projecting in AR!"))
return
if(!(soulcatcher.setting_flags & NIF_SC_PROJECTING))
to_chat(src,"<span class='warning'>Projecting from this NIF has been disabled!</span>")
to_chat(src,span_warning("Projecting from this NIF has been disabled!"))
return
if(!client || !client.prefs)
@@ -572,7 +572,7 @@
set category = "Soulcatcher"
if(!eyeobj)
to_chat(src,"<span class='warning'>You're not projecting into AR!</span>")
to_chat(src,span_warning("You're not projecting into AR!"))
return
eyeobj.forceMove(get_turf(nif))
@@ -583,7 +583,7 @@
set category = "Soulcatcher"
if(!eyeobj)
to_chat(src,"<span class='warning'>You're not projecting into AR!</span>")
to_chat(src,span_warning("You're not projecting into AR!"))
return
QDEL_NULL(eyeobj)
+1 -1
View File
@@ -81,7 +81,7 @@
var/message = combined["formatted"]
var/name_used = M.GetVoice()
var/rendered = null
rendered = "<span class='game say'>[icon2html(icon_object,mob.client)] <span class='name'>[name_used]</span> [message]</span>"
rendered = span_game(span_say("[icon2html(icon_object,mob.client)] [span_name(name_used)] [message]"))
mob.show_message(rendered, 2)
//Not supported by the internal one
+9 -9
View File
@@ -21,7 +21,7 @@
deactivate()
return FALSE
H.visible_message("<span class='warning'>Thin snakelike tendrils grow from [H] and connect to \the [apc].</span>","<span class='notice'>Thin snakelike tendrils grow from you and connect to \the [apc].</span>")
H.visible_message(span_warning("Thin snakelike tendrils grow from [H] and connect to \the [apc]."),span_notice("Thin snakelike tendrils grow from you and connect to \the [apc]."))
/datum/nifsoft/apc_recharge/deactivate(var/force = FALSE)
if((. = ..()))
@@ -36,7 +36,7 @@
return TRUE
else
nif.notify("APC charging has ended.")
H.visible_message("<span class='warning'>[H]'s snakelike tendrils whip back into their body from \the [apc].</span>","<span class='notice'>The APC connector tendrils return to your body.</span>")
H.visible_message(span_warning("[H]'s snakelike tendrils whip back into their body from \the [apc]."),span_notice("The APC connector tendrils return to your body."))
deactivate()
return FALSE
@@ -105,11 +105,11 @@
/datum/nifsoft/compliance/activate()
if((. = ..()))
to_chat(nif.human,"<span class='danger'>You are compelled to follow these rules: </span>\n<span class='notify'>[laws]</span>")
to_chat(nif.human,span_danger("You are compelled to follow these rules: </span>\n<span class='notify'>[laws]"))
/datum/nifsoft/compliance/install()
if((. = ..()))
to_chat(nif.human,"<span class='danger'>You feel suddenly compelled to follow these rules: </span>\n<span class='notify'>[laws]</span>")
to_chat(nif.human,span_danger("You feel suddenly compelled to follow these rules: </span>\n<span class='notify'>[laws]"))
/datum/nifsoft/compliance/uninstall()
nif.notify("ERROR! Unable to comply!",TRUE)
@@ -131,12 +131,12 @@
if (!nif.human.size_range_check(new_size))
if(new_size)
to_chat(nif.human,"<span class='notice'>The safety features of the NIF Program prevent you from choosing this size.</span>")
to_chat(nif.human,span_notice("The safety features of the NIF Program prevent you from choosing this size."))
return
else
if(nif.human.resize(new_size/100, uncapped=nif.human.has_large_resize_bounds(), ignore_prefs = TRUE))
to_chat(nif.human,"<span class='notice'>You set the size to [new_size]%</span>")
nif.human.visible_message("<span class='warning'>Swirling grey mist envelops [nif.human] as they change size!</span>","<span class='notice'>Swirling streams of nanites wrap around you as you change size!</span>")
to_chat(nif.human,span_notice("You set the size to [new_size]%"))
nif.human.visible_message(span_warning("Swirling grey mist envelops [nif.human] as they change size!"),span_notice("Swirling streams of nanites wrap around you as you change size!"))
spawn(0)
deactivate()
@@ -188,7 +188,7 @@
/datum/nifsoft/malware/activate()
if((. = ..()))
to_chat(nif.human,"<span class='danger'>Runtime error in 15_misc.dm, line 191.</span>")
to_chat(nif.human,span_danger("Runtime error in 15_misc.dm, line 191."))
/datum/nifsoft/malware/install()
if((. = ..()))
@@ -198,4 +198,4 @@
if((. = ..()))
if(nif.human.client && world.time - last_ads > rand(10 MINUTES, 15 MINUTES) && prob(1))
last_ads = world.time
nif.human.client.create_fake_ad_popup_multiple(/obj/screen/popup/default, 5)
nif.human.client.create_fake_ad_popup_multiple(/obj/screen/popup/default, 5)