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
+8 -8
View File
@@ -186,9 +186,9 @@
/obj/effect/alien/weeds/attackby(var/obj/item/W, var/mob/user)
user.setClickCooldown(user.get_attack_speed(W))
if(LAZYLEN(W.attack_verb))
visible_message("<span class='danger'>\The [src] have been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]</span>")
visible_message(span_danger("\The [src] have been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]"))
else
visible_message("<span class='danger'>\The [src] have been attacked with \the [W][(user ? " by [user]." : ".")]</span>")
visible_message(span_danger("\The [src] have been attacked with \the [W][(user ? " by [user]." : ".")]"))
var/damage = W.force / 4.0
@@ -203,7 +203,7 @@
healthcheck()
/obj/effect/alien/weeds/attack_generic(var/mob/user, var/damage, var/attack_verb)
visible_message("<span class='danger'>[user] [attack_verb] the [src]!</span>")
visible_message(span_danger("[user] [attack_verb] the [src]!"))
user.do_attack_animation(src)
health -= damage
healthcheck()
@@ -267,7 +267,7 @@
if(ticks >= target_strength)
for(var/mob/O in hearers(src, null))
O.show_message("<span class='alium'>[src.target] collapses under its own weight into a puddle of goop and undigested debris!</span>", 1)
O.show_message(span_alium("[src.target] collapses under its own weight into a puddle of goop and undigested debris!"), 1)
if(iswall(target)) //Gurgs : Spruced up corrosive acid
var/turf/simulated/wall/W = target
@@ -282,13 +282,13 @@
switch(target_strength - ticks)
if(6)
visible_message("<span class='alium'>[src.target] is holding up against the acid!</span>")
visible_message(span_alium("[src.target] is holding up against the acid!"))
if(4)
visible_message("<span class='alium'>[src.target]\s structure is being melted by the acid!</span>")
visible_message(span_alium("[src.target]\s structure is being melted by the acid!"))
if(2)
visible_message("<span class='alium'>[src.target] is struggling to withstand the acid!</span>")
visible_message(span_alium("[src.target] is struggling to withstand the acid!"))
if(0 to 1)
visible_message("<span class='alium'>[src.target] begins to crumble under the acid!</span>")
visible_message(span_alium("[src.target] begins to crumble under the acid!"))
spawn(rand(150, 200)) tick()
//Xenomorph Effect egg removed, replaced with Structure Egg.
+5 -5
View File
@@ -168,23 +168,23 @@
/obj/structure/foamedmetal/attack_hand(var/mob/user)
if ((HULK in user.mutations) || (prob(75 - metal * 25)))
user.visible_message("<span class='warning'>[user] smashes through the foamed metal.</span>", "<span class='notice'>You smash through the metal foam wall.</span>")
user.visible_message(span_warning("[user] smashes through the foamed metal."), span_notice("You smash through the metal foam wall."))
qdel(src)
else
to_chat(user, "<span class='notice'>You hit the metal foam but bounce off it.</span>")
to_chat(user, span_notice("You hit the metal foam but bounce off it."))
return
/obj/structure/foamedmetal/attackby(var/obj/item/I, var/mob/user)
if(istype(I, /obj/item/grab))
var/obj/item/grab/G = I
G.affecting.loc = src.loc
visible_message("<span class='warning'>[G.assailant] smashes [G.affecting] through the foamed metal wall.</span>")
visible_message(span_warning("[G.assailant] smashes [G.affecting] through the foamed metal wall."))
qdel(I)
qdel(src)
return
if(prob(I.force * 20 - metal * 25))
user.visible_message("<span class='warning'>[user] smashes through the foamed metal.</span>", "<span class='notice'>You smash through the foamed metal with \the [I].</span>")
user.visible_message(span_warning("[user] smashes through the foamed metal."), span_notice("You smash through the foamed metal with \the [I]."))
qdel(src)
else
to_chat(user, "<span class='notice'>You hit the metal foam to no effect.</span>")
to_chat(user, span_notice("You hit the metal foam to no effect."))
@@ -127,7 +127,7 @@ var/global/list/image/splatter_cache=list()
return
var/taken = rand(1,amount)
amount -= taken
to_chat(user, "<span class='notice'>You get some of \the [src] on your hands.</span>")
to_chat(user, span_notice("You get some of \the [src] on your hands."))
if (!user.blood_DNA)
user.blood_DNA = list()
user.blood_DNA |= blood_DNA.Copy()
@@ -16,7 +16,7 @@
anchored = TRUE
/obj/effect/decal/cleanable/ash/attack_hand(mob/user as mob)
to_chat(user, "<span class='notice'>[src] sifts through your fingers.</span>")
to_chat(user, span_notice("[src] sifts through your fingers."))
var/turf/simulated/floor/F = get_turf(src)
if (istype(F))
F.dirt += 4
@@ -158,6 +158,6 @@
icon_state = "confetti"
/obj/effect/decal/cleanable/confetti/attack_hand(mob/user)
to_chat(user, "<span class='notice'>You start to meticulously pick up the confetti.</span>")
to_chat(user, span_notice("You start to meticulously pick up the confetti."))
if(do_after(user, 60))
qdel(src)
@@ -35,12 +35,12 @@
//must place on a wall and user must not be inside a closet/mecha/whatever
var/turf/W = A
if (!iswall(W) || !isturf(user.loc))
to_chat(user, "<span class='warning'>You can't place this here!</span>")
to_chat(user, span_warning("You can't place this here!"))
return
var/placement_dir = get_dir(user, W)
if (!(placement_dir in cardinal))
to_chat(user, "<span class='warning'>You must stand directly in front of the wall you wish to place that on.</span>")
to_chat(user, span_warning("You must stand directly in front of the wall you wish to place that on."))
return
//just check if there is a poster on or adjacent to the wall
@@ -56,10 +56,10 @@
break
if (stuff_on_wall)
to_chat(user, "<span class='notice'>There is already a poster there!</span>")
to_chat(user, span_notice("There is already a poster there!"))
return
to_chat(user, "<span class='notice'>You start placing the poster on the wall...</span>") //Looks like it's uncluttered enough. Place the poster.
to_chat(user, span_notice("You start placing the poster on the wall...")) //Looks like it's uncluttered enough. Place the poster.
var/obj/structure/sign/poster/P = new poster_type(user.loc, placement_dir=get_dir(user, W), serial=serial_number, itemtype = src.type)
@@ -72,7 +72,7 @@
if(!P) return
if(iswall(W) && user && P.loc == user.loc) //Let's check if everything is still there
to_chat(user, "<span class='notice'>You place the poster!</span>")
to_chat(user, span_notice("You place the poster!"))
else
P.roll_and_drop(P.loc)
@@ -183,10 +183,10 @@
if(W.has_tool_quality(TOOL_WIRECUTTER))
playsound(src, W.usesound, 100, 1)
if(ruined)
to_chat(user, "<span class='notice'>You remove the remnants of the poster.</span>")
to_chat(user, span_notice("You remove the remnants of the poster."))
qdel(src)
else
to_chat(user, "<span class='notice'>You carefully remove the poster from the wall.</span>")
to_chat(user, span_notice("You carefully remove the poster from the wall."))
roll_and_drop(user.loc)
return
@@ -200,7 +200,7 @@
if(ruined || !user.Adjacent(src))
return
visible_message("<span class='warning'>[user] rips [src] in a single, decisive motion!</span>" )
visible_message(span_warning("[user] rips [src] in a single, decisive motion!") )
playsound(src, 'sound/items/poster_ripped.ogg', 100, 1)
ruined = 1
icon_state = "poster_ripped"
@@ -239,4 +239,4 @@
//Non-Random Posters
/obj/structure/sign/poster/custom
roll_type = /obj/item/contraband/poster/custom
roll_type = /obj/item/contraband/poster/custom
@@ -41,12 +41,12 @@
//must place on a wall and user must not be inside a closet/mecha/whatever
var/turf/W = A
if(!iswall(W) || !isturf(user.loc))
to_chat(user, "<span class='warning'>You can't place this here!</span>")
to_chat(user, span_warning("You can't place this here!"))
return FALSE
var/placement_dir = get_dir(user, W)
if(!(placement_dir in cardinal))
to_chat(user, "<span class='warning'>You must stand directly in front of the wall you wish to place that on.</span>")
to_chat(user, span_warning("You must stand directly in front of the wall you wish to place that on."))
return FALSE
//just check if there is a poster on or adjacent to the wall
@@ -62,15 +62,15 @@
break
if(stuff_on_wall)
to_chat(user, "<span class='notice'>There is already a poster there!</span>")
to_chat(user, span_notice("There is already a poster there!"))
return FALSE
to_chat(user, "<span class='notice'>You start placing the poster on the wall...</span>") //Looks like it's uncluttered enough. Place the poster.
to_chat(user, span_notice("You start placing the poster on the wall...")) //Looks like it's uncluttered enough. Place the poster.
var/obj/structure/sign/poster/P = new poster_type(user.loc, get_dir(user, W), src)
if(do_after(user, 17)) //Let's check if everything is still there
to_chat(user, "<span class='notice'>You place the poster!</span>")
to_chat(user, span_notice("You place the poster!"))
qdel(src)
return TRUE
@@ -168,10 +168,10 @@
if(W.has_tool_quality(TOOL_WIRECUTTER))
playsound(src, W.usesound, 100, 1)
if(ruined)
to_chat(user, "<span class='notice'>You remove the remnants of the poster.</span>")
to_chat(user, span_notice("You remove the remnants of the poster."))
qdel(src)
else
to_chat(user, "<span class='notice'>You carefully remove the poster from the wall.</span>")
to_chat(user, span_notice("You carefully remove the poster from the wall."))
roll_and_drop(get_turf(user))
return
@@ -185,7 +185,7 @@
if(ruined || !user.Adjacent(src))
return
visible_message("<span class='warning'>[user] rips [src] in a single, decisive motion!</span>" )
visible_message(span_warning("[user] rips [src] in a single, decisive motion!") )
playsound(src, 'sound/items/poster_ripped.ogg', 100, 1)
ruined = TRUE
icon_state = "poster_ripped"
+2 -2
View File
@@ -56,14 +56,14 @@
icon_state = "mummified2"
/obj/effect/decal/remains/attack_hand(mob/user as mob)
to_chat(user, "<span class='notice'>[src] sinks together into a pile of ash.</span>")
to_chat(user, span_notice("[src] sinks together into a pile of ash."))
var/turf/simulated/floor/F = get_turf(src)
if(istype(F))
new /obj/effect/decal/cleanable/ash(F)
qdel(src)
/obj/effect/decal/remains/robot/attack_hand(mob/user as mob)
to_chat(user, "<span class='notice'>[src] crumbles down into a pile of debris.</span>")
to_chat(user, span_notice("[src] crumbles down into a pile of debris."))
var/turf/simulated/floor/F = get_turf(src)
if(istype(F))
new /obj/effect/decal/cleanable/blood/gibs/robot(F)
+3 -3
View File
@@ -544,10 +544,10 @@ steam.start() -- spawns the effect
s.start()
for(var/mob/M in viewers(5, location))
to_chat(M, "<span class='warning'>The solution violently explodes.</span>")
to_chat(M, span_warning("The solution violently explodes."))
for(var/mob/M in viewers(1, location))
if (prob (50 * amount))
to_chat(M, "<span class='warning'>The explosion knocks you down.</span>")
to_chat(M, span_warning("The explosion knocks you down."))
M.Weaken(rand(1,5))
return
else
@@ -570,7 +570,7 @@ steam.start() -- spawns the effect
flash = (amount/4) * flashing_factor
for(var/mob/M in viewers(8, location))
to_chat(M, "<span class='warning'>The solution violently explodes.</span>")
to_chat(M, span_warning("The solution violently explodes."))
explosion(
location,
+1 -1
View File
@@ -18,7 +18,7 @@
/obj/effect/gibspawner/proc/Gib(atom/location, var/datum/dna/MobDNA = null)
if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len)
to_world("<span class='warning'>Gib list length mismatch!</span>")
to_world(span_warning("Gib list length mismatch!"))
return
var/obj/effect/decal/cleanable/blood/gibs/gib = null
@@ -21,7 +21,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/poi_loader)
/obj/effect/landmark/poi_loader/proc/annihilate_bounds()
//var/deleted_atoms = 0
//admin_notice("<span class='danger'>Annihilating objects in poi loading location.</span>", R_DEBUG)
//admin_notice(span_danger("Annihilating objects in poi loading location."), R_DEBUG)
var/list/turfs_to_clean = get_turfs_to_clean()
if(turfs_to_clean.len)
for(var/x in 1 to 2) // Requires two passes to get everything.
@@ -29,7 +29,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/poi_loader)
for(var/atom/movable/AM in T)
//++deleted_atoms
qdel(AM)
//admin_notice("<span class='danger'>Annihilated [deleted_atoms] objects.</span>", R_DEBUG)
//admin_notice(span_danger("Annihilated [deleted_atoms] objects."), R_DEBUG)
/obj/effect/landmark/poi_loader/proc/load_poi()
var/turf/T = get_turf(src)
@@ -61,7 +61,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/poi_loader)
if(!template_to_use)
return
//admin_notice("<span class='danger'>Chosen Predefined PoI Map: [chosen_type.name]</span>", R_DEBUG)
//admin_notice(span_danger("Chosen Predefined PoI Map: [chosen_type.name]"), R_DEBUG)
if(remove_from_pool)
global_used_pois[poi_type] -= template_to_use
@@ -70,4 +70,4 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/poi_loader)
annihilate_bounds()
//CHECK_TICK //Don't let anything else happen for now
// Actually load it
template_to_use.load(T)
template_to_use.load(T)
@@ -241,7 +241,7 @@ when portals are shortly lived, or when portals are made to be obvious with spec
var/list/mobs_to_relay = in_range["mobs"]
for(var/mob/mob as anything in mobs_to_relay)
var/rendered = "<span class='message'>[text]</span>"
var/rendered = span_message("[text]")
mob.show_message(rendered)
..()
@@ -250,7 +250,7 @@ when portals are shortly lived, or when portals are made to be obvious with spec
/obj/effect/map_effect/portal/master/show_message(msg, type, alt, alt_type)
if(!counterpart)
return
var/rendered = "<span class='message'>[msg]</span>"
var/rendered = span_message("[msg]")
var/turf/T = counterpart.get_focused_turf()
var/list/in_range = get_mobs_and_objs_in_view_fast(T, world.view, 0)
var/list/mobs_to_relay = in_range["mobs"]
@@ -273,7 +273,7 @@ when portals are shortly lived, or when portals are made to be obvious with spec
var/message = combined["formatted"]
var/name_used = M.GetVoice()
var/rendered = null
rendered = "<span class='game say'><span class='name'>[name_used]</span> [message]</span>"
rendered = span_game(span_say("[span_name(name_used)] [message]"))
mob.show_message(rendered, 2)
..()
+4 -4
View File
@@ -103,8 +103,8 @@
/obj/effect/mine/attackby(obj/item/W as obj, mob/living/user as mob)
if(W.has_tool_quality(TOOL_SCREWDRIVER))
panel_open = !panel_open
user.visible_message("<span class='warning'>[user] very carefully screws the mine's panel [panel_open ? "open" : "closed"].</span>",
"<span class='notice'>You very carefully screw the mine's panel [panel_open ? "open" : "closed"].</span>")
user.visible_message(span_warning("[user] very carefully screws the mine's panel [panel_open ? "open" : "closed"]."),
span_notice("You very carefully screw the mine's panel [panel_open ? "open" : "closed"]."))
playsound(src, W.usesound, 50, 1)
// Panel open, stay uncloaked, or uncloak if already cloaked. If you don't cloak on place, ignore it and just be normal alpha.
@@ -310,9 +310,9 @@
/obj/item/mine/attackby(obj/item/W as obj, mob/living/user as mob)
if(W.has_tool_quality(TOOL_SCREWDRIVER) && trap)
to_chat(user, "<span class='notice'>You begin removing \the [trap].</span>")
to_chat(user, span_notice("You begin removing \the [trap]."))
if(do_after(user, 10 SECONDS))
to_chat(user, "<span class='notice'>You finish disconnecting the mine's trigger.</span>")
to_chat(user, span_notice("You finish disconnecting the mine's trigger."))
trap.forceMove(get_turf(src))
trap = null
return
+2 -2
View File
@@ -68,9 +68,9 @@
// Todo: Add a version that gradually reaccumulates over time by means of alpha transparency. -Spades
/obj/effect/overlay/snow/attackby(obj/item/W as obj, mob/user as mob)
if (istype(W, /obj/item/shovel))
user.visible_message("<span class='notice'>[user] begins to shovel away \the [src].</span>")
user.visible_message(span_notice("[user] begins to shovel away \the [src]."))
if(do_after(user, 40))
to_chat(user, "<span class='notice'>You have finished shoveling!</span>")
to_chat(user, span_notice("You have finished shoveling!"))
qdel(src)
return
+10 -10
View File
@@ -24,9 +24,9 @@
user.setClickCooldown(user.get_attack_speed(W))
if(LAZYLEN(W.attack_verb))
visible_message("<span class='warning'>\The [src] has been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]</span>")
visible_message(span_warning("\The [src] has been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]"))
else
visible_message("<span class='warning'>\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]</span>")
visible_message(span_warning("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]"))
var/damage = W.force / 4.0
@@ -44,12 +44,12 @@
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
user.do_attack_animation(src)
if(prob(20))
visible_message("<span class='warning'>\The [user] tries to stomp on \the [src], but misses!</span>")
visible_message(span_warning("\The [user] tries to stomp on \the [src], but misses!"))
var/list/nearby = oview(2, src)
if(length(nearby))
walk_to(src, pick(nearby), 2)
return
visible_message("<span class='warning'>\The [user] stomps \the [src] dead!</span>")
visible_message(span_warning("\The [user] stomps \the [src] dead!"))
die()
/obj/effect/spider/bullet_act(var/obj/item/projectile/Proj)
@@ -191,7 +191,7 @@
..()
/obj/effect/spider/spiderling/die()
visible_message("<span class='alert'>[src] dies!</span>")
visible_message(span_alert("[src] dies!"))
new /obj/effect/decal/cleanable/spiderling_remains(src.loc)
..()
@@ -222,7 +222,7 @@
return
if(prob(50))
src.visible_message("<span class='notice'>You hear something squeezing through the ventilation ducts.</span>",2)
src.visible_message(span_notice("You hear something squeezing through the ventilation ducts."),2)
sleep(travel_time)
if(!exit_vent || exit_vent.welded)
@@ -246,14 +246,14 @@
if(!O.owner || O.owner.stat == DEAD || amount_grown > 80)
O.implants -= src
src.loc = O.owner ? O.owner.loc : O.loc
src.visible_message("<span class='warning'>\A [src] makes its way out of [O.owner ? "[O.owner]'s [O.name]" : "\the [O]"]!</span>")
src.visible_message(span_warning("\A [src] makes its way out of [O.owner ? "[O.owner]'s [O.name]" : "\the [O]"]!"))
if(O.owner)
O.owner.apply_damage(1, BRUTE, O.organ_tag)
else if(prob(1))
O.owner.apply_damage(1, TOX, O.organ_tag)
if(world.time > last_itch + 30 SECONDS)
last_itch = world.time
to_chat(O.owner, "<span class='notice'>Your [O.name] itches...</span>")
to_chat(O.owner, span_notice("Your [O.name] itches..."))
else if(prob(1))
src.visible_message("<b>\The [src]</b> skitters.")
@@ -268,7 +268,7 @@
var/target_atom = pick(nearby)
walk_to(src, target_atom, 5)
if(prob(25))
src.visible_message("<span class='notice'>\The [src] skitters[pick(" away"," around","")].</span>")
src.visible_message(span_notice("\The [src] skitters[pick(" away"," around","")]."))
else if(amount_grown < 75 && prob(5))
//vent crawl!
for(var/obj/machinery/atmospherics/unary/vent_pump/v in view(7,src))
@@ -318,7 +318,7 @@
icon_state = pick("cocoon1","cocoon2","cocoon3")
/obj/effect/spider/cocoon/Destroy()
src.visible_message("<span class='warning'>\The [src] splits open.</span>")
src.visible_message(span_warning("\The [src] splits open."))
for(var/atom/movable/A in contents)
A.loc = src.loc
return ..()
+2 -2
View File
@@ -257,7 +257,7 @@ var/global/list/tele_landmarks = list() // Terrible, but the alternative is loop
/obj/effect/step_trigger/death/Trigger(var/atom/movable/A)
if(isliving(A))
to_chat(A, "<span class='danger'>[deathmessage]</span>")
to_chat(A, span_danger("[deathmessage]"))
log_and_message_admins("[A] [deathalert]")
qdel(A)
@@ -281,7 +281,7 @@ var/global/list/tele_landmarks = list() // Terrible, but the alternative is loop
/obj/effect/step_trigger/warning/Trigger(var/atom/movable/A)
if(isliving(A))
to_chat(A, "<span class='warning'>[warningmessage]</span>")
to_chat(A, span_warning("[warningmessage]"))
/obj/effect/step_trigger/warning/train_edge
warningmessage = "The wind billowing alongside the train is extremely strong here! Any movement could easily pull you down beneath the carriages, return to the train immediately!"