finish up the spans (#9605)

This commit is contained in:
Kashargul
2024-12-09 22:51:05 +01:00
committed by GitHub
parent 19bc22ddb3
commit fe4b5ec2cb
80 changed files with 359 additions and 361 deletions
+5 -5
View File
@@ -42,7 +42,7 @@
/obj/item/oldtwohanded/mob_can_equip(M as mob, slot, disable_warning = FALSE)
//Cannot equip wielded items.
if(wielded)
to_chat(M, "<span class='warning'>Unwield the [initial(name)] first!</span>")
to_chat(M, span_warning("Unwield the [initial(name)] first!"))
return 0
return ..()
@@ -67,7 +67,7 @@
if(wielded) //Trying to unwield it
unwield()
user << "<span class='notice'>You are now carrying the [name] with one hand.</span>"
user << span_notice("You are now carrying the [name] with one hand.")
if (src.unwieldsound)
playsound(src.loc, unwieldsound, 50, 1)
@@ -77,10 +77,10 @@
else //Trying to wield it
if(user.get_inactive_hand())
user << "<span class='warning'>You need your other hand to be empty</span>"
user << span_warning("You need your other hand to be empty")
return
wield()
user << "<span class='notice'>You grab the [initial(name)] with both hands.</span>"
user << span_notice("You grab the [initial(name)] with both hands.")
if (src.wieldsound)
playsound(src.loc, wieldsound, 50, 1)
@@ -126,4 +126,4 @@
edge = 0
sharp = 1
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
@@ -949,10 +949,10 @@
if(ishuman(loc))
var/mob/living/carbon/human/H = src.loc
if(H.wear_suit != src)
to_chat(H, "<span class='warning'>You must be wearing [src] to put up the hood!</span>")
to_chat(H, span_warning("You must be wearing [src] to put up the hood!"))
return
if(H.head)
to_chat(H, "<span class='warning'>You're already wearing something on your head!</span>")
to_chat(H, span_warning("You're already wearing something on your head!"))
return
else
H.equip_to_slot_if_possible(hood,slot_head,0,0,1)
@@ -1268,11 +1268,11 @@
if(ring_on)
icon_state = "[base_icon]"
ring_on = 0
usr << "<span class='notice'>You remove the right earring.</span>"
usr << span_notice("You remove the right earring.")
else
icon_state = "[base_icon]_on"
ring_on = 1
usr << "<span class='notice'>You put on the right earring.</span>"
usr << span_notice("You put on the right earring.")
update_clothing_icon()
@@ -1315,7 +1315,7 @@
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse/big))
return ..()
else
to_chat(H,"<span class='warning'>You need to have a kentauri half to wear this.</span>")
to_chat(H,span_warning("You need to have a kentauri half to wear this."))
return 0
/obj/item/clothing/suit/armor/vest/harpsong/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0, var/icon/clip_mask = null)
+16 -16
View File
@@ -18,7 +18,7 @@
if(time2 < 10)
time2 = "0[time2]"
user.visible_message("<span class='rose'>[src] displays [time1]:[time2]</span>")
user.visible_message(span_rose("[src] displays [time1]:[time2]"))
else
return ..()
return
@@ -87,7 +87,7 @@
/obj/item/toy/bosunwhistle/fluff/strix/attack_self(mob/user as mob)
if(cooldown < world.time - 15)
user << "<span class='notice'>You blow on [src], creating an ear-splitting noise!</span>"
user << span_notice("You blow on [src], creating an ear-splitting noise!")
playsound(user, 'sound/misc/boatswain.ogg', 25, 1)
cooldown = world.time
@@ -157,18 +157,18 @@
/obj/item/melee/goz_whitecane/attack_self(mob/user as mob)
on = !on
if(on)
user.visible_message("<span class='notice'>\The [user] extends the white cane.</span>",\
"<span class='warning'>You extend the white cane.</span>",\
"You hear an ominous click.")
user.visible_message(span_notice("\The [user] extends the white cane."),\
span_warning("You extend the white cane."),\
span_hear("You hear an ominous click."))
icon_state = "goz_whitecane_1"
item_state_slots = list(slot_r_hand_str = "goz_whitecane", slot_l_hand_str = "goz_whitecane")
w_class = ITEMSIZE_NORMAL
force = 5
attack_verb = list("smacked", "struck", "craked", "beaten")
else
user.visible_message("<span class='notice'>\The [user] collapses the white cane.</span>",\
"<span class='notice'>You collapse the white cane.</span>",\
"You hear a click.")
user.visible_message(span_notice("\The [user] collapses the white cane."),\
span_notice("You collapse the white cane."),\
span_hear("You hear a click."))
icon_state = "goz_whitecane_0"
item_state_slots = list(slot_r_hand_str = null, slot_l_hand_str = null)
w_class = ITEMSIZE_SMALL
@@ -187,7 +187,7 @@
/obj/item/melee/goz_whitecane/attack(mob/M as mob, mob/user as mob)
if(user.a_intent == I_HELP)
user.visible_message("<span class='notice'>\The [user] has lightly tapped [M] on the ankle with their white cane!</span>")
user.visible_message(span_notice("\The [user] has lightly tapped [M] on the ankle with their white cane!"))
return
else
..()
@@ -440,7 +440,7 @@
if(user.r_hand == src || user.l_hand == src)
if(icon_state != "[basestate]-s")
icon_state = "[basestate]-s"
user.visible_message("<span class='rose'>[user] spins the [src]!</span>")
user.visible_message(span_rose("[user] spins the [src]!"))
spawn(100)
icon_state = "[basestate]"
else
@@ -458,7 +458,7 @@
if(user.r_hand == src || user.l_hand == src)
if(icon_state != "squeezetoy-s")
icon_state = "squeezetoy-s"
user.visible_message("<span class='rose'>[user] squeezes the [src] a few times!</span>")
user.visible_message(span_rose("[user] squeezes the [src] a few times!"))
spawn(50)
icon_state = "squeezetoy"
else
@@ -477,11 +477,11 @@
if(user.r_hand == src || user.l_hand == src)
if(folded == 0)
icon_state = "infinitycube0"
user.visible_message("<span class='rose'>[user] folds the [src]!</span>")
user.visible_message(span_rose("[user] folds the [src]!"))
folded = 1
else if(folded == 1)
icon_state = "infinitycube1"
user.visible_message("<span class='rose'>[user] unfolds the [src]!</span>")
user.visible_message(span_rose("[user] unfolds the [src]!"))
folded = 0
else
return ..()
@@ -607,13 +607,13 @@
icon_state = "implanter1_1"
/obj/item/implanter/fluff/coda/remove_implant() //No way to remove this implant.
to_chat(usr, "<span class='notice'>It seems \the [imp] can't be removed from \the [src].</span>")
to_chat(usr, span_notice("It seems \the [imp] can't be removed from \the [src]."))
return
/obj/item/implanter/fluff/coda/attack()
..()
if(!imp) //After injection, the implanter poofs.
to_chat(usr, "<span class='notice'>\The [src] disentegrates after you use it!</span>")
to_chat(usr, span_notice("\The [src] disentegrates after you use it!"))
qdel(src)
/obj/item/implant/fluff/coda
@@ -631,7 +631,7 @@
/obj/item/implant/fluff/coda/process()
if(implanted_in && (src.imp_in != implanted_in)) //If the implant is removed.
implanted_in.setBrainLoss(200)
visible_message("<span class='notice'>\The [src] shorts and sparks during removal, frying itself!</span>")
visible_message(span_notice("\The [src] shorts and sparks during removal, frying itself!"))
playsound(src.loc, "sparks", 50, 1)
STOP_PROCESSING(SSobj, src)
name = "melted implant"