Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some more spanning #1904

Merged
merged 1 commit into from
Jan 29, 2024
Merged

Some more spanning #1904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ModularTegustation/anomaly_items/anomaly_tools.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

/obj/item/construction/rcd/arcd/bluespace/attackby(obj/item/C, mob/user)
if(istype(C, /obj/item/assembly/signaler/anomaly/bluespace) && !anomaly_core)
to_chat(user, "<span class='notice'>You insert [C] into the [src] and green light blinks on the panel.</span>")
to_chat(user, span_notice("You insert [C] into the [src] and green light blinks on the panel."))
anomaly_core = TRUE
playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE)
desc = "A prototype RCD with ranged capability and extended capacity."
Expand All @@ -26,19 +26,19 @@

/obj/item/construction/rcd/arcd/bluespace/attack_self(mob/user)
if(!anomaly_core)
to_chat(user, "<span class='warning'>The BRCD requires a bluespace anomaly core to operate!</span>")
to_chat(user, span_warning("The BRCD requires a bluespace anomaly core to operate!"))
return
. = ..()

/obj/item/construction/rcd/arcd/bluespace/afterattack(atom/A, mob/user)
if(!anomaly_core)
to_chat(user, "<span class='warning'>The BRCD requires a bluespace anomaly core to operate!</span>")
to_chat(user, span_warning("The BRCD requires a bluespace anomaly core to operate!"))
return
. = ..()

/obj/item/construction/rcd/arcd/bluespace/range_check(atom/A, mob/user)
if(!(A in view(rcd_range, get_turf(user))))
to_chat(user, "<span class='warning'>The \'Out of Range\' light on [src] blinks red.</span>")
to_chat(user, span_warning("The \"Out of Range\" light on [src] blinks red."))
return FALSE
else
return TRUE
Expand All @@ -62,14 +62,14 @@

/obj/item/clothing/shoes/magboots/noslow/attack_self(mob/user)
if(!anomaly_core)
to_chat(user, "<span class='warning'>[src] require a gravity anomaly core to operate!</span>")
to_chat(user, span_warning("[src] require a gravity anomaly core to operate!"))
return
. = ..()

/obj/item/clothing/shoes/magboots/noslow/attackby(obj/item/C, mob/user)
if(istype(C, /obj/item/assembly/signaler/anomaly/grav) && !anomaly_core)
name = "anomalous magboots"
to_chat(user, "<span class='notice'>You insert [C] into [src] and they start to feel much lighter.</span>")
to_chat(user, span_notice("You insert [C] into [src] and they start to feel much lighter."))
playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE)
anomaly_core = TRUE
throw_speed = 3
Expand Down
6 changes: 3 additions & 3 deletions ModularTegustation/anomaly_items/anomaly_weapons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

/obj/item/gun/energy/vortex_gun/attackby(obj/item/C, mob/user)
if(istype(C, /obj/item/assembly/signaler/anomaly/vortex) && !firing_core)
to_chat(user, "<span class='notice'>You insert [C] into the [src] and the weapon starts humming.</span>")
to_chat(user, span_notice("You insert [C] into the [src] and the weapon starts humming."))
firing_core = TRUE
playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE)
qdel(C)
Expand All @@ -53,7 +53,7 @@
/obj/item/gun/energy/vortex_gun/shoot_with_empty_chamber(mob/living/user)
. = ..()
if(!firing_core)
to_chat(user, "<span class='danger'>The display says, 'NO CORE INSTALLED'.</span>")
to_chat(user, span_danger("The display says, \"NO CORE INSTALLED\"."))

// Casing
/obj/item/ammo_casing/energy/vortex
Expand Down Expand Up @@ -155,7 +155,7 @@

/obj/item/melee/flux_sword/attackby(obj/item/C, mob/user)
if(istype(C, /obj/item/assembly/signaler/anomaly/flux) && !anomaly_ready)
to_chat(user, "<span class='notice'>You insert [C] into the [src].</span>")
to_chat(user, span_notice("You insert [C] into the [src]."))
playsound(src.loc, "sparks", 50, TRUE)
name = "flux sword"
anomaly_ready = TRUE
Expand Down
6 changes: 3 additions & 3 deletions ModularTegustation/fishing/code/fishing_items/_debug_items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/obj/item/fishing_rod/debug/examine(mob/user)
. = ..()
. += "<span class='notice'>you can click on this rod to set how fast it fishes, right now its [speed_override * 0.1] seconds.</span>"
. += span_notice("you can click on this rod to set how fast it fishes, right now its [speed_override * 0.1] seconds.")

/obj/item/fishing_rod/debug/attack_self(mob/user, datum/source)
speed_override = input(user, "How fast do you wish to fish in seconds?", "debug fishing speed") as num|null
Expand Down Expand Up @@ -49,9 +49,9 @@
var/old_name = T.name
if(!istype(T, turf_type))
if(T.TerraformTurf(turf_type, flags = CHANGETURF_INHERIT_AIR))
user.visible_message("<span class='danger'>[user] turns \the [old_name] into [transform_string]!</span>")
user.visible_message(span_danger("[user] turns \the [old_name] into [transform_string]!"))
playsound(T, 'sound/machines/terminal_processing.ogg', 20, TRUE)
else
if(T.TerraformTurf(reset_turf_type, flags = CHANGETURF_INHERIT_AIR))
user.visible_message("<span class='danger'>[user] turns \the [old_name] into [reset_string]!</span>")
user.visible_message(span_danger("[user] turns \the [old_name] into [reset_string]!"))
playsound(T, 'sound/machines/terminal_processing.ogg', 20, TRUE)
6 changes: 3 additions & 3 deletions ModularTegustation/fishing/code/fishing_items/fishing_bag.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@
show_message = TRUE
else
if(!spam_protection)
to_chat(user, "<span class='warning'>Your [name] is full and can't hold any more!</span>")
to_chat(user, span_warning("Your [name] is full and can't hold any more!"))
spam_protection = TRUE
continue
if(show_message)
playsound(user, "rustle", 50, TRUE)
user.visible_message("<span class='notice'>[user] scoops up the fish beneath [user.p_them()].</span>", \
"<span class='notice'>You scoop up the fish beneath you with your [name].</span>")
user.visible_message(span_notice("[user] scoops up the fish beneath [user.p_them()]."), \
span_notice("You scoop up the fish beneath you with your [name]."))
spam_protection = FALSE
16 changes: 8 additions & 8 deletions ModularTegustation/fishing/code/fishing_items/fishing_hat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
/obj/item/clothing/head/beret/fishing_hat/examine(mob/user)
. = ..()
if(amount > 1)
. += "<span class='boldwarning'>My god... it seems someone has stacked together [amount] of these hats!</span>"
. += span_boldwarning("My god... it seems someone has stacked together [amount] of these hats!")
switch(amount)
if(3 to 9)
. += "<span class='warning'>You feel a strange aura coming from the hats...</span>"
. += span_warning("You feel a strange aura coming from the hats...")
if(10 to 15)
. += "<span class='warning'>As the hat stack grows taller, you feel dreadfull.</span>"
. += span_warning("As the hat stack grows taller, you feel dreadfull.")
if(15 to 19)
. += "<span class='warning'>What is a wave without the ocean? a beginning without an end?</span>"
. += "<span class='notice'>You feel as if you are approaching the limit.</span>"
. += span_warning("What is a wave without the ocean? a beginning without an end?")
. += span_notice("You feel as if you are approaching the limit.")
if(20)
. += "<span class='warning'>We are different... yet we go together.</span>"
. += span_warning("We are different... yet we go together.")

/obj/item/clothing/head/beret/fishing_hat/attackby(obj/item/attacking_item, mob/living/user)
. = ..()
Expand All @@ -34,11 +34,11 @@
amount += attacking_hat.amount
if(amount > 20)
amount = 20
to_chat(user, "<span class='boldwarning'>The hat refuses to become any larger, yet accepts your offering anyway.</span>")
to_chat(user, span_boldwarning("The hat refuses to become any larger, yet accepts your offering anyway."))
qdel(attacking_hat)
return
else
to_chat(user, "<span class='boldwarning'>You put the hat in your hand on the second hat, you feel their powers combining and forming something greater...</span>")
to_chat(user, span_boldwarning("You put the hat in your hand on the second hat, you feel their powers combining and forming something greater..."))
if(scaling)
scale_multiplier = (attacking_hat.scale_multiplier)
transform = transform.Scale(scale_multiplier, scale_multiplier)
Expand Down
4 changes: 2 additions & 2 deletions ModularTegustation/fishing/code/fishing_items/fishing_net.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
icon_state = "trawling_net_empty"
anchored = TRUE
max_integrity = 5
break_message = "<span class='notice'>The net falls apart!</span>"
break_message = span_notice("The net falls apart!")
break_sound = 'sound/items/wirecutter.ogg'
debris = list(/obj/item/fishing_net = 1)
var/fishin_cooldown = 25 SECONDS
Expand All @@ -32,7 +32,7 @@
/obj/structure/destructible/fishing_net/examine(mob/user)
. = ..()
if(contents.len > 0)
. += "<span class='notice'>[contents.len]/5 things are caught in the [src].</span>"
. += span_notice("[contents.len]/5 things are caught in the [src].")

/obj/structure/destructible/fishing_net/AltClick(mob/user)
. = ..()
Expand Down
8 changes: 4 additions & 4 deletions ModularTegustation/languagebooks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
return TRUE

/obj/item/book/granter/language_book/on_reading_start(mob/user)
to_chat(user, "<span class='notice'>You start leafing through the language book...</span>")
to_chat(user, span_notice("You start leafing through the language book..."))

/obj/item/book/granter/language_book/on_reading_finished(mob/user)
to_chat(user, "<span class='notice'>You feel you've learned enough to understand [language_name]!</span>")
to_chat(user, span_notice("You feel you've learned enough to understand [language_name]!"))
user.grant_language(learnable_language)
var/obj/item/organ/tongue/T = user.getorgan(/obj/item/organ/tongue)
if(!(learnable_language in T.languages_possible))
Expand All @@ -24,12 +24,12 @@
desc += " The pages are blank. Seems like copy protection."

/obj/item/book/granter/language_book/recoil(mob/user)
to_chat(user, "<span class='notice'>All the pages are blank, how useless!</span>")
to_chat(user, span_notice("All the pages are blank, how useless!"))

/obj/item/book/granter/language_book/onlearned(mob/user)
..()
if(oneuse)
to_chat(user, "<span class='notice'>The words on the pages fade and vanish!</span>")
to_chat(user, span_notice("The words on the pages fade and vanish!"))

/obj/item/book/granter/language_book/common
name = "Ashwalker's Guide To The Galaxy"
Expand Down
2 changes: 1 addition & 1 deletion ModularTegustation/lc13_spawners.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,5 @@
if(atom_rename && !iseffect(M))
M.name = atom_rename
if(spawn_flavor_text)
M.visible_message("<span class='danger'>[M] [spawn_flavor_text].</span>")
M.visible_message(span_danger("[M] [spawn_flavor_text]."))
return M
16 changes: 8 additions & 8 deletions ModularTegustation/looc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ GLOBAL_VAR_INIT(normal_looc_colour, "#e597e8")
set category = "OOC"

if(GLOB.say_disabled) //This is here to try to identify lag problems
to_chat(usr, "<span class='danger'> Speech is currently admin-disabled.</span>")
to_chat(usr, span_danger(" Speech is currently admin-disabled."))
return

if(!mob)
Expand All @@ -19,12 +19,12 @@ GLOBAL_VAR_INIT(normal_looc_colour, "#e597e8")
return

if(!(prefs.chat_toggles & CHAT_OOC))
to_chat(src, "<span class='danger'> You have OOC muted.</span>")
to_chat(src, span_danger(" You have OOC muted."))
return

if(!holder)
if(prefs.muted & MUTE_OOC)
to_chat(src, "<span class='danger'> You cannot use OOC (muted).</span>")
to_chat(src, span_danger(" You cannot use OOC (muted)."))
return
if(handle_spam_prevention(msg,MUTE_OOC))
return
Expand All @@ -33,13 +33,13 @@ GLOBAL_VAR_INIT(normal_looc_colour, "#e597e8")
log_admin("[key_name(src)] has attempted to advertise in LOOC: [msg]")
return
if(mob.stat)
to_chat(src, "<span class='danger'>You cannot use LOOC while unconscious or dead.</span>")
to_chat(src, span_danger("You cannot use LOOC while unconscious or dead."))
return
if(isdead(mob))
to_chat(src, "<span class='danger'>You cannot use LOOC while ghosting.</span>")
to_chat(src, span_danger("You cannot use LOOC while ghosting."))
return
if(is_banned_from(ckey, "OOC"))
to_chat(src, "<span class='danger'>You have been banned from OOC.</span>")
to_chat(src, span_danger("You have been banned from OOC."))
return
if(QDELETED(src))
return
Expand Down Expand Up @@ -67,7 +67,7 @@ GLOBAL_VAR_INIT(normal_looc_colour, "#e597e8")
if(GLOB.LOOC_COLOR)
to_chat(C, "<font color='[GLOB.LOOC_COLOR]'><b><span class='prefix'>LOOC:</span> <EM>[src.mob.name]:</EM> <span class='message'>[msg]</span></b></font>", type = MESSAGE_TYPE_LOOC)
else
to_chat(C, "<span class='looc'><span class='prefix'>LOOC:</span> <EM>[src.mob.name]:</EM> <span class='message'>[msg]</span></span>", type = MESSAGE_TYPE_LOOC)
to_chat(C, span_looc("<span class='prefix'>LOOC:</span> <EM>[src.mob.name]:</EM> <span class='message'>[msg]</span>"), type = MESSAGE_TYPE_LOOC)

for(var/client/C in GLOB.admins)
if(C.prefs.chat_toggles & CHAT_OOC)
Expand All @@ -77,7 +77,7 @@ GLOBAL_VAR_INIT(normal_looc_colour, "#e597e8")
if(GLOB.LOOC_COLOR)
to_chat(C, "<font color='[GLOB.LOOC_COLOR]'><b>[ADMIN_FLW(usr)] <span class='prefix'>[prefix]:</span> <EM>[src.key]/[src.mob.name]:</EM> <span class='message'>[msg]</span></b></font>", type = MESSAGE_TYPE_LOOC)
else
to_chat(C, "<span class='looc'>[ADMIN_FLW(usr)] <span class='prefix'>[prefix]:</span> <EM>[src.key]/[src.mob.name]:</EM> <span class='message'>[msg]</span></span>", type = MESSAGE_TYPE_LOOC)
to_chat(C, span_looc("[ADMIN_FLW(usr)] <span class='prefix'>[prefix]:</span> <EM>[src.key]/[src.mob.name]:</EM> <span class='message'>[msg]</span>"), type = MESSAGE_TYPE_LOOC)


/mob/proc/get_top_level_mob()
Expand Down
2 changes: 1 addition & 1 deletion ModularTegustation/resindoor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
return ..()

/obj/structure/mineral_door/resin/wrench_act(mob/living/user, obj/item/I)
to_chat(user, "<span class='notice'>It appears that there are no bolts on the [src].</span>")
to_chat(user, span_notice("It appears that there are no bolts on the [src]."))
return

/obj/structure/mineral_door/resin/welder_act(mob/living/user, obj/item/I)
Expand Down
2 changes: 1 addition & 1 deletion ModularTegustation/t5_parts.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
/obj/vehicle/ridden/wheelchair/motorized/proc/RunOver(mob/living/carbon/H)
var/bloodiness = 0
log_combat(src, H, "run over", null, "(DAMTYPE: [uppertext(BRUTE)])")
H.visible_message("<span class='danger'>[src] runs [H] over!</span>", "<span class='userdanger'>[src] runs you over!</span>")
H.visible_message(span_danger("[src] runs [H] over!"), span_userdanger("[src] runs you over!"))
playsound(loc, 'sound/effects/splat.ogg', 50, TRUE)

var/damage = rand(7,9) //Choose a number between 7 and 9, then use that number for the damage calculations applied to the head, chest, legs and arms.
Expand Down
4 changes: 2 additions & 2 deletions ModularTegustation/tegu_borg_code/cyborg_upgrades.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ GLOBAL_LIST_INIT(basic_engiborg_manipulator_allowed, typecacheof(list(

var/obj/item/borg/apparatus/circuit/C = locate() in R.model.modules
if(!C)
to_chat(user, "<span class='warning'>This unit has no [C] to upgrade!</span>")
to_chat(user, span_warning("This unit has no [C] to upgrade!"))
return FALSE

if(C.upgraded) //Delete the basic manipulator if we have it
to_chat(user, "<span class='warning'>This unit already has an upgraded [C].</span>")
to_chat(user, span_warning("This unit already has an upgraded [C]."))
return FALSE

C.upgraded = TRUE
Expand Down
16 changes: 8 additions & 8 deletions ModularTegustation/tegu_borg_code/medborg_holobed.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
var/turf/T = get_turf(target)
var/distance = get_dist(T, src)
if(distance > holo_range)
to_chat(user, "<span class='warning'>[src] can't project that far! (<b>[distance - holo_range]</b> tiles beyond the maximum range of <b>[holo_range]</b>)</span>")
to_chat(user, span_warning("[src] can't project that far! (<b>[distance - holo_range]</b> tiles beyond the maximum range of <b>[holo_range]</b>)"))
return
if(!isopenturf(T))
return
Expand Down Expand Up @@ -50,7 +50,7 @@
user = loc

if(user)
to_chat(user, "<span class='notice'>[src] stops projecting [loaded].</span>")
to_chat(user, span_notice("[src] stops projecting [loaded]."))

playsound(get_turf(src), 'sound/machines/chime.ogg', 30, TRUE)
new /obj/effect/temp_visual/dir_setting/firing_effect/magic(get_turf(loaded))
Expand All @@ -67,10 +67,10 @@
loaded = new(src)
loaded.projector = src
loaded.forceMove(location)
user.visible_message("<span class='notice'>[user] projects [loaded].</span>", "<span class='notice'>You project [loaded].</span>")
user.visible_message(span_notice("[user] projects [loaded]."), span_notice("You project [loaded]."))

else if(location != get_turf(loaded))
loaded.visible_message("<span class='warning'>[src] suddenly flickers and vanishes!</span>")
loaded.visible_message(span_warning("[src] suddenly flickers and vanishes!"))
new /obj/effect/temp_visual/dir_setting/firing_effect/magic(get_turf(loaded))
loaded.handle_unbuckling()
loaded.forceMove(location)
Expand Down Expand Up @@ -104,15 +104,15 @@

new /obj/effect/temp_visual/dir_setting/firing_effect/magic(src.loc)
handle_unbuckling()
visible_message("<span class='warning'>[src] suddenly flickers and vanishes!</span>")
visible_message(span_warning("[src] suddenly flickers and vanishes!"))
return ..()

/obj/structure/bed/holobed/play_attack_sound(damage_amount, damage_type = BRUTE)
playsound(src, 'sound/effects/empulse.ogg', 50, TRUE)

/obj/structure/bed/holobed/attackby(obj/item/W, mob/user, params)
if(W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1))
to_chat("<span class='notice'>You can't dismantle this! It's made of hard light!</span>")
to_chat(span_notice("You can't dismantle this! It's made of hard light!"))
return
else
return ..()
Expand All @@ -132,7 +132,7 @@
if(buckled_mobs.len > 1 || !user)
unbuckle_all_mobs()
if(user)
user.visible_message("<span class='notice'>[user] unbuckles all creatures from [src].</span>")
user.visible_message(span_notice("[user] unbuckles all creatures from [src]."))
else
user_unbuckle_mob(buckled_mobs[1],user)

Expand All @@ -147,7 +147,7 @@
. = ..()
if(validate_location()) //Check if we're out of projection range
return
visible_message("<span class='warning'>[src] suddenly flickers and vanishes!</span>")
visible_message(span_warning("[src] suddenly flickers and vanishes!"))
qdel(src)
/obj/structure/bed/holobed/proc/validate_location()
if(!projector) //nothing projecting the bed so auto-fail
Expand Down
Loading
Loading