cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 14:37:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactors most spans

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/under/accessories/accessory.dm
+1 -1
View File
@@ -83,7 +83,7 @@
has_suit.add_overlay(get_inv_overlay())
if(user)
to_chat(user, "<span class='notice'>You attach \the [src] to \the [has_suit].</span>")
to_chat(user, span_notice("You attach \the [src] to \the [has_suit]."))
add_fingerprint(user)
/obj/item/clothing/accessory/proc/on_removed(var/mob/user)
code/modules/clothing/under/accessories/accessory_vr.dm
+42 -42
View File
@@ -52,9 +52,9 @@
name = "[design] [material] [type]"
desc = "A [type], made of [material]. It's rather [design]."
customized = 1
to_chat(usr,"<span class='notice'>[src] has now been customized.</span>")
to_chat(usr,span_notice("[src] has now been customized."))
else
to_chat(usr,"<span class='notice'>[src] has already been customized!</span>")
to_chat(usr,span_notice("[src] has already been customized!"))
/obj/item/clothing/accessory/collar
slot_flags = SLOT_TIE | SLOT_OCLOTHING
@@ -169,11 +169,11 @@
if(href_list["tag"])
var/str = copytext(reject_bad_text(tgui_input_text(usr,"Tag text?","Set tag","",MAX_NAME_LEN)),1,MAX_NAME_LEN)
if(!str || !length(str))
to_chat(usr,"<span class='notice'>[name]'s tag set to be blank.</span>")
to_chat(usr,span_notice("[name]'s tag set to be blank."))
name = initial(name)
desc = initial(desc)
else
to_chat(usr,"<span class='notice'>You set the [name]'s tag to '[str]'.</span>")
to_chat(usr,span_notice("You set the [name]'s tag to '[str]'."))
name = initial(name) + " ([str])"
desc = initial(desc) + " The tag says \"[str]\"."
else
@@ -215,7 +215,7 @@
M = loc
if(ismob(loc.loc))
M = loc.loc // This is about as terse as I can make my solution to the whole 'collar won't work when attached as accessory' thing.
to_chat(M,"<span class='danger'>You feel a sharp shock!</span>")
to_chat(M,span_danger("You feel a sharp shock!"))
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, M)
s.start()
@@ -293,21 +293,21 @@
/obj/item/clothing/accessory/collar/attack_self(mob/user as mob)
if(istype(src,/obj/item/clothing/accessory/collar/holo))
to_chat(user,"<span class='notice'>[name]'s interface is projected onto your hand.</span>")
to_chat(user,span_notice("[name]'s interface is projected onto your hand."))
else
if(writtenon)
to_chat(user,"<span class='notice'>You need a pen or a screwdriver to edit the tag on this collar.</span>")
to_chat(user,span_notice("You need a pen or a screwdriver to edit the tag on this collar."))
return
to_chat(user,"<span class='notice'>You adjust the [name]'s tag.</span>")
to_chat(user,span_notice("You adjust the [name]'s tag."))
var/str = copytext(reject_bad_text(tgui_input_text(user,"Tag text?","Set tag","",MAX_NAME_LEN)),1,MAX_NAME_LEN)
if(!str || !length(str))
to_chat(user,"<span class='notice'>[name]'s tag set to be blank.</span>")
to_chat(user,span_notice("[name]'s tag set to be blank."))
name = initial(name)
desc = initial(desc)
else
to_chat(user,"<span class='notice'>You set the [name]'s tag to '[str]'.</span>")
to_chat(user,span_notice("You set the [name]'s tag to '[str]'."))
initialize_tag(str)
/obj/item/clothing/accessory/collar/proc/initialize_tag(var/tag)
@@ -331,7 +331,7 @@
update_collartag(user, I, "crossed out", "cross out", "written")
return
to_chat(user,"<span class='notice'>You need a pen or a screwdriver to edit the tag on this collar.</span>")
to_chat(user,span_notice("You need a pen or a screwdriver to edit the tag on this collar."))
/obj/item/clothing/accessory/collar/proc/update_collartag(mob/user, obj/item/I, var/erasemethod, var/erasing, var/writemethod)
if(!(istype(user.get_active_hand(),I)) || !(istype(user.get_inactive_hand(),src)) || (user.stat))
@@ -341,19 +341,19 @@
if(!str || !length(str))
if(!writtenon)
to_chat(user,"<span class='notice'>You don't write anything.</span>")
to_chat(user,span_notice("You don't write anything."))
else
to_chat(user,"<span class='notice'>You [erasing] the words with the [I].</span>")
to_chat(user,span_notice("You [erasing] the words with the [I]."))
name = initial(name)
desc = initial(desc) + " The tag has had the words [erasemethod]."
else
if(!writtenon)
to_chat(user,"<span class='notice'>You write '[str]' on the tag with the [I].</span>")
to_chat(user,span_notice("You write '[str]' on the tag with the [I]."))
name = initial(name) + " ([str])"
desc = initial(desc) + " \"[str]\" has been [writemethod] on the tag."
writtenon = 1
else
to_chat(user,"<span class='notice'>You [erasing] the words on the tag with the [I], and write '[str]'.</span>")
to_chat(user,span_notice("You [erasing] the words on the tag with the [I], and write '[str]'."))
name = initial(name) + " ([str])"
desc = initial(desc) + " Something has been [erasemethod] on the tag, and it now has \"[str]\" [writemethod] on it."
@@ -381,11 +381,11 @@
if(href_list["tag"])
var/str = copytext(reject_bad_text(tgui_input_text(usr,"Tag text?","Set tag","",MAX_NAME_LEN)),1,MAX_NAME_LEN)
if(!str || !length(str))
to_chat(usr,"<span class='notice'>[name]'s tag set to be blank.</span>")
to_chat(usr,span_notice("[name]'s tag set to be blank."))
name = initial(name)
desc = initial(desc)
else
to_chat(usr,"<span class='notice'>You set the [name]'s tag to '[str]'.</span>")
to_chat(usr,span_notice("You set the [name]'s tag to '[str]'."))
name = initial(name) + " ([str])"
desc = initial(desc) + " The tag says \"[str]\"."
else
@@ -400,9 +400,9 @@
if(!size_select)
return //cancelled
target_size = clamp((size_select/100), RESIZE_MINIMUM_DORMS, RESIZE_MAXIMUM_DORMS)
to_chat(usr, "<span class='notice'>You set the size to [size_select]%</span>")
to_chat(usr, span_notice("You set the size to [size_select]%"))
if(target_size < RESIZE_MINIMUM || target_size > RESIZE_MAXIMUM)
to_chat(usr, "<span class='notice'>Note: Resizing limited to 25-200% automatically while outside dormatory areas.</span>") //hint that we clamp it in resize
to_chat(usr, span_notice("Note: Resizing limited to 25-200% automatically while outside dormatory areas.")) //hint that we clamp it in resize
if(!( master ))
if(istype(loc, /mob))
attack_self(loc)
@@ -463,7 +463,7 @@
var/mob/living/carbon/human/H = M
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
if(!H.resizable)
H.visible_message("<span class='warning'>The space around [H] compresses for a moment but then nothing happens.</span>","<span class='notice'>The space around you distorts but nothing happens to you.</span>")
H.visible_message(span_warning("The space around [H] compresses for a moment but then nothing happens."),span_notice("The space around you distorts but nothing happens to you."))
return
if(H.size_multiplier != target_size)
if(!(world.time - last_activated > 10 SECONDS))
@@ -472,18 +472,18 @@
last_activated = world.time
original_size = H.size_multiplier
H.resize(target_size, ignore_prefs = FALSE) //In case someone else tries to put it on you.
H.visible_message("<span class='warning'>The space around [H] distorts as they change size!</span>","<span class='notice'>The space around you distorts as you change size!</span>")
H.visible_message(span_warning("The space around [H] distorts as they change size!"),span_notice("The space around you distorts as you change size!"))
log_admin("Admin [key_name(M)]'s size was altered by a bluespace collar.")
s.set_up(3, 1, M)
s.start()
else if(H.size_multiplier == target_size)
if(original_size == null)
H.visible_message("<span class='warning'>The space around [H] twists and turns for a moment but then nothing happens.</span>","<span class='notice'>The space around you distorts but stay the same size.</span>")
H.visible_message(span_warning("The space around [H] twists and turns for a moment but then nothing happens."),span_notice("The space around you distorts but stay the same size."))
return
last_activated = world.time
H.resize(original_size, ignore_prefs = FALSE)
original_size = null
H.visible_message("<span class='warning'>The space around [H] distorts as they return to their original size!</span>","<span class='notice'>The space around you distorts as you return to your original size!</span>")
H.visible_message(span_warning("The space around [H] distorts as they return to their original size!"),span_notice("The space around you distorts as you return to your original size!"))
log_admin("Admin [key_name(M)]'s size was altered by a bluespace collar.")
to_chat(M, "<span class ='warning'>\The [src] flickers. It is now recharging and will be ready again in ten seconds.</span>")
s.set_up(3, 1, M)
@@ -495,7 +495,7 @@
/obj/item/clothing/accessory/collar/shock/bluespace/attackby(var/obj/item/component, mob/user as mob)
if (component.has_tool_quality(TOOL_WRENCH))
to_chat(user, "<span class='notice'>You crack the bluespace crystal [src].</span>")
to_chat(user, span_notice("You crack the bluespace crystal [src]."))
var/turf/T = get_turf(src)
new /obj/item/clothing/accessory/collar/shock/bluespace/malfunctioning(T)
user.drop_from_inventory(src)
@@ -504,7 +504,7 @@
if (!istype(component,/obj/item/assembly/signaler))
..()
return
to_chat(user, "<span class='notice'>You wire the signaler into the [src].</span>")
to_chat(user, span_notice("You wire the signaler into the [src]."))
user.drop_item()
qdel(component)
var/turf/T = get_turf(src)
@@ -526,7 +526,7 @@
/obj/item/clothing/accessory/collar/shock/bluespace/modified/attackby(var/obj/item/component, mob/user as mob)
if (component.has_tool_quality(TOOL_WRENCH))
to_chat(user, "<span class='notice'>You crack the bluespace crystal [src], the attached signaler disconnects.</span>")
to_chat(user, span_notice("You crack the bluespace crystal [src], the attached signaler disconnects."))
var/turf/T = get_turf(src)
new /obj/item/clothing/accessory/collar/shock/bluespace/malfunctioning(T)
user.drop_from_inventory(src)
@@ -535,7 +535,7 @@
if (!istype(component,/obj/item/assembly/signaler))
..()
return
to_chat(user, "<span class='notice'>There is already a signaler wired to the [src].</span>")
to_chat(user, span_notice("There is already a signaler wired to the [src]."))
return
/obj/item/clothing/accessory/collar/shock/bluespace/modified/attack_self(mob/user as mob, flag1)
@@ -570,11 +570,11 @@
if(href_list["tag"])
var/str = copytext(reject_bad_text(tgui_input_text(usr,"Tag text?","Set tag","",MAX_NAME_LEN)),1,MAX_NAME_LEN)
if(!str || !length(str))
to_chat(usr,"<span class='notice'>[name]'s tag set to be blank.</span>")
to_chat(usr,span_notice("[name]'s tag set to be blank."))
name = initial(name)
desc = initial(desc)
else
to_chat(usr,"<span class='notice'>You set the [name]'s tag to '[str]'.</span>")
to_chat(usr,span_notice("You set the [name]'s tag to '[str]'."))
name = initial(name) + " ([str])"
desc = initial(desc) + " The tag says \"[str]\"."
if(!( master ))
@@ -609,10 +609,10 @@
var/mob/living/carbon/human/H = M
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
if(!H.resizable)
H.visible_message("<span class='warning'>The space around [H] compresses for a moment but then nothing happens.</span>","<span class='notice'>The space around you distorts but nothing happens to you.</span>")
H.visible_message(span_warning("The space around [H] compresses for a moment but then nothing happens."),span_notice("The space around you distorts but nothing happens to you."))
return
if (target_size < 0.26)
H.visible_message("<span class='warning'>The collar on [H] flickers, but fizzles out.</span>","<span class='notice'>Your collar flickers, but is not powerful enough to shrink you that small.</span>")
H.visible_message(span_warning("The collar on [H] flickers, but fizzles out."),span_notice("Your collar flickers, but is not powerful enough to shrink you that small."))
return
if(H.size_multiplier != target_size)
if(!(world.time - last_activated > 10 SECONDS))
@@ -621,18 +621,18 @@
last_activated = world.time
original_size = H.size_multiplier
H.resize(target_size, ignore_prefs = FALSE) //In case someone else tries to put it on you.
H.visible_message("<span class='warning'>The space around [H] distorts as they change size!</span>","<span class='notice'>The space around you distorts as you change size!</span>")
H.visible_message(span_warning("The space around [H] distorts as they change size!"),span_notice("The space around you distorts as you change size!"))
log_admin("Admin [key_name(M)]'s size was altered by a bluespace collar.")
s.set_up(3, 1, M)
s.start()
else if(H.size_multiplier == target_size)
if(original_size == null)
H.visible_message("<span class='warning'>The space around [H] twists and turns for a moment but then nothing happens.</span>","<span class='notice'>The space around you distorts but stay the same size.</span>")
H.visible_message(span_warning("The space around [H] twists and turns for a moment but then nothing happens."),span_notice("The space around you distorts but stay the same size."))
return
last_activated = world.time
H.resize(original_size, ignore_prefs = FALSE)
original_size = null
H.visible_message("<span class='warning'>The space around [H] distorts as they return to their original size!</span>","<span class='notice'>The space around you distorts as you return to your original size!</span>")
H.visible_message(span_warning("The space around [H] distorts as they return to their original size!"),span_notice("The space around you distorts as you return to your original size!"))
log_admin("Admin [key_name(M)]'s size was altered by a bluespace collar.")
to_chat(M, "<span class ='warning'>\The [src] flickers. It is now recharging and will be ready again in ten seconds.</span>")
s.set_up(3, 1, M)
@@ -655,7 +655,7 @@
if (!istype(component,/obj/item/assembly/signaler))
..()
return
to_chat(user, "<span class='notice'>The signaler doesn't respond to the connection attempt [src].</span>")
to_chat(user, span_notice("The signaler doesn't respond to the connection attempt [src]."))
return
/obj/item/clothing/accessory/collar/shock/bluespace/malfunctioning/attack_self(mob/user as mob, flag1)
@@ -697,11 +697,11 @@
if(href_list["tag"])
var/str = copytext(reject_bad_text(tgui_input_text(usr,"Tag text?","Set tag","",MAX_NAME_LEN)),1,MAX_NAME_LEN)
if(!str || !length(str))
to_chat(usr,"<span class='notice'>[name]'s tag set to be blank.</span>")
to_chat(usr,span_notice("[name]'s tag set to be blank."))
name = initial(name)
desc = initial(desc)
else
to_chat(usr,"<span class='notice'>You set the [name]'s tag to '[str]'.</span>")
to_chat(usr,span_notice("You set the [name]'s tag to '[str]'."))
name = initial(name) + " ([str])"
desc = initial(desc) + " The tag says \"[str]\"."
else
@@ -742,10 +742,10 @@
var/mob/living/carbon/human/H = M
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
if(!H.resizable)
H.visible_message("<span class='warning'>The space around [H] compresses for a moment but then nothing happens.</span>","<span class='notice'>The space around you distorts but nothing happens to you.</span>")
H.visible_message(span_warning("The space around [H] compresses for a moment but then nothing happens."),span_notice("The space around you distorts but nothing happens to you."))
return
if (target_size < 0.25)
H.visible_message("<span class='warning'>The collar on [H] flickers, but fizzles out.</span>","<span class='notice'>Your collar flickers, but is not powerful enough to shrink you that small.</span>")
H.visible_message(span_warning("The collar on [H] flickers, but fizzles out."),span_notice("Your collar flickers, but is not powerful enough to shrink you that small."))
return
if(currently_shrinking == 0)
if(!(world.time - last_activated > 10 SECONDS))
@@ -755,19 +755,19 @@
original_size = H.size_multiplier
currently_shrinking = 1
H.resize(target_size, ignore_prefs = FALSE) //In case someone else tries to put it on you.
H.visible_message("<span class='warning'>The space around [H] distorts as they change size!</span>","<span class='notice'>The space around you distorts as you change size!</span>")
H.visible_message(span_warning("The space around [H] distorts as they change size!"),span_notice("The space around you distorts as you change size!"))
log_admin("Admin [key_name(M)]'s size was altered by a bluespace collar.")
s.set_up(3, 1, M)
s.start()
else if(currently_shrinking == 1)
if(original_size == null)
H.visible_message("<span class='warning'>The space around [H] twists and turns for a moment but then nothing happens.</span>","<span class='notice'>The space around you distorts but stay the same size.</span>")
H.visible_message(span_warning("The space around [H] twists and turns for a moment but then nothing happens."),span_notice("The space around you distorts but stay the same size."))
return
last_activated = world.time
H.resize(original_size, ignore_prefs = FALSE)
original_size = null
currently_shrinking = 0
H.visible_message("<span class='warning'>The space around [H] distorts as they return to their original size!</span>","<span class='notice'>The space around you distorts as you return to your original size!</span>")
H.visible_message(span_warning("The space around [H] distorts as they return to their original size!"),span_notice("The space around you distorts as you return to your original size!"))
log_admin("Admin [key_name(M)]'s size was altered by a bluespace collar.")
to_chat(M, "<span class ='warning'>\The [src] flickers. It is now recharging and will be ready again in ten seconds.</span>")
s.set_up(3, 1, M)
code/modules/clothing/under/accessories/armor.dm
+4 -4
View File
@@ -17,13 +17,13 @@
if((body_parts_covered & ARMS) && istype(H.gloves, /obj/item/clothing))
var/obj/item/clothing/G = H.gloves
if(G.body_parts_covered & ARMS)
to_chat(H, "<span class='warning'>You can't wear \the [src] with \the [G], it's in the way.</span>")
to_chat(H, span_warning("You can't wear \the [src] with \the [G], it's in the way."))
S.accessories -= src
return
else if((body_parts_covered & LEGS) && istype(H.shoes, /obj/item/clothing))
var/obj/item/clothing/Sh = H.shoes
if(Sh.body_parts_covered & LEGS)
to_chat(H, "<span class='warning'>You can't wear \the [src] with \the [Sh], it's in the way.</span>")
to_chat(H, span_warning("You can't wear \the [src] with \the [Sh], it's in the way."))
S.accessories -= src
return
..()
@@ -167,7 +167,7 @@
if(!(def_zone in list(BP_TORSO, BP_GROIN)))
reflectchance /= 2
if(P.starting && prob(reflectchance))
visible_message("<span class='danger'>\The [user]'s [src.name] reflects [attack_text]!</span>")
visible_message(span_danger("\The [user]'s [src.name] reflects [attack_text]!"))
var/new_x = P.starting.x + pick(0, 0, 0, 0, 0, -1, 1, -2, 2)
@@ -435,4 +435,4 @@
/obj/item/clothing/accessory/armor/helmcover/saare
name = "\improper SAARE helmet cover"
desc = "A fabric cover for armored helmets. This one has SAARE's colors."
icon_state = "helmcover_saare"
icon_state = "helmcover_saare"
code/modules/clothing/under/accessories/badges.dm
+6 -6
View File
@@ -28,13 +28,13 @@
if(isliving(user))
if(stored_name)
user.visible_message("<span class='notice'>[user] displays their [src.name].\nIt reads: [stored_name], [badge_string].</span>","<span class='notice'>You display your [src.name].\nIt reads: [stored_name], [badge_string].</span>")
user.visible_message(span_notice("[user] displays their [src.name].\nIt reads: [stored_name], [badge_string]."),span_notice("You display your [src.name].\nIt reads: [stored_name], [badge_string]."))
else
user.visible_message("<span class='notice'>[user] displays their [src.name].\nIt reads: [badge_string].</span>","<span class='notice'>You display your [src.name]. It reads: [badge_string].</span>")
user.visible_message(span_notice("[user] displays their [src.name].\nIt reads: [badge_string]."),span_notice("You display your [src.name]. It reads: [badge_string]."))
/obj/item/clothing/accessory/badge/attack(mob/living/carbon/human/M, mob/living/user)
if(isliving(user))
user.visible_message("<span class='danger'>[user] invades [M]'s personal space, thrusting [src] into their face insistently.</span>","<span class='danger'>You invade [M]'s personal space, thrusting [src] into their face insistently.</span>")
user.visible_message(span_danger("[user] invades [M]'s personal space, thrusting [src] into their face insistently."),span_danger("You invade [M]'s personal space, thrusting [src] into their face insistently."))
user.do_attack_animation(M)
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //NO SPAM
@@ -94,11 +94,11 @@
/obj/item/clothing/accessory/badge/holo/emag_act(var/remaining_charges, var/mob/user)
if (emagged)
to_chat(user, "<span class='danger'>\The [src] is already cracked.</span>")
to_chat(user, span_danger("\The [src] is already cracked."))
return
else
emagged = 1
to_chat(user, "<span class='danger'>You crack the holobadge security checks.</span>")
to_chat(user, span_danger("You crack the holobadge security checks."))
return 1
/obj/item/clothing/accessory/badge/holo/attackby(var/obj/item/O as obj, var/mob/user as mob)
@@ -195,7 +195,7 @@
/obj/item/clothing/accessory/badge/sheriff/attack(mob/living/carbon/human/M, mob/living/user)
if(isliving(user))
user.visible_message("<span class='danger'>[user] invades [M]'s personal space, the sheriff badge into their face!.</span>","<span class='danger'>You invade [M]'s personal space, thrusting the sheriff badge into their face insistently.</span>")
user.visible_message(span_danger("[user] invades [M]'s personal space, the sheriff badge into their face!."),span_danger("You invade [M]'s personal space, thrusting the sheriff badge into their face insistently."))
user.do_attack_animation(M)
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //NO SPAM
code/modules/clothing/under/accessories/badges_vr.dm
+6 -6
View File
@@ -30,7 +30,7 @@
if(current_film)
user.put_in_hands(current_film)
current_film = null
to_chat(user, "<span class='notice'>You pulled out the film out of \the [src].</span>")
to_chat(user, span_notice("You pulled out the film out of \the [src]."))
desc = "This seems like a dosimeter, but there is no film inside."
STOP_PROCESSING(SSobj, src)
update_state(0)
@@ -47,13 +47,13 @@
current_film = I
update_state(current_film.state)
to_chat(user, "<span class='notice'>You inserted the film into \the [src].</span>")
to_chat(user, span_notice("You inserted the film into \the [src]."))
desc = "This seems like a dosimeter. It has a film inside."
if(current_film.state < 2)
START_PROCESSING(SSobj, src)
else
to_chat(user, "<span class='notice'>\The [src] already has a film inside.</span>")
to_chat(user, span_notice("\The [src] already has a film inside."))
else
return ..()
@@ -61,11 +61,11 @@
if(wearer)
if(current_film && (wearer.radiation >= 25) && (current_film.state == 0))
update_state(1)
visible_message("<span class='warning'>The film of \the [src] starts to darken.</span>")
visible_message(span_warning("The film of \the [src] starts to darken."))
desc = "This seems like a dosimeter, but the film has darkened."
sleep(30)
else if(current_film && (wearer.radiation >= 50) && (current_film.state == 1))
visible_message("<span class='warning'>The film of \the [src] has turned black!</span>")
visible_message(span_warning("The film of \the [src] has turned black!"))
update_state(2)
desc = "This seems like a dosimeter, but the film has turned black."
@@ -124,4 +124,4 @@
new /obj/item/clothing/accessory/dosimeter(src)
new /obj/item/dosimeter_film(src)
new /obj/item/dosimeter_film(src)
new /obj/item/dosimeter_film(src)
new /obj/item/dosimeter_film(src)
code/modules/clothing/under/accessories/holster.dm
+12 -12
View File
@@ -12,17 +12,17 @@
/obj/item/clothing/accessory/holster/proc/holster(var/obj/item/I, var/mob/living/user)
if(holstered && istype(user))
to_chat(user, "<span class='warning'>There is already \a [holstered] holstered here!</span>")
to_chat(user, span_warning("There is already \a [holstered] holstered here!"))
return
//VOREStation Edit - Machete sheath support
if (LAZYLEN(can_hold))
if(!is_type_in_list(I,can_hold))
to_chat(user, "<span class='warning'>[I] won't fit in [src]!</span>")
to_chat(user, span_warning("[I] won't fit in [src]!"))
return
else if (!(I.slot_flags & SLOT_HOLSTER))
//VOREStation Edit End
to_chat(user, "<span class='warning'>[I] won't fit in [src]!</span>")
to_chat(user, span_warning("[I] won't fit in [src]!"))
return
if(holster_in)
@@ -34,7 +34,7 @@
user.drop_from_inventory(holstered, target = src)
holstered.add_fingerprint(user)
w_class = max(w_class, holstered.w_class)
user.visible_message("<span class='notice'>[user] holsters \the [holstered].</span>", "<span class='notice'>You holster \the [holstered].</span>")
user.visible_message(span_notice("[user] holsters \the [holstered]."), span_notice("You holster \the [holstered]."))
name = "occupied [initial(name)]"
/obj/item/clothing/accessory/holster/proc/clear_holster()
@@ -46,19 +46,19 @@
return
if(istype(user.get_active_hand(),/obj) && istype(user.get_inactive_hand(),/obj))
to_chat(user, "<span class='warning'>You need an empty hand to draw \the [holstered]!</span>")
to_chat(user, span_warning("You need an empty hand to draw \the [holstered]!"))
else
var/sound_vol = 25
if(user.a_intent == I_HURT)
sound_vol = 50
usr.visible_message(
"<span class='danger'>[user] draws \the [holstered], ready to go!</span>", //VOREStation Edit
"<span class='warning'>You draw \the [holstered], ready to go!</span>" //VOREStation Edit
span_danger("[user] draws \the [holstered], ready to go!"), //VOREStation Edit
span_warning("You draw \the [holstered], ready to go!") //VOREStation Edit
)
else
user.visible_message(
"<span class='notice'>[user] draws \the [holstered], pointing it at the ground.</span>",
"<span class='notice'>You draw \the [holstered], pointing it at the ground.</span>"
span_notice("[user] draws \the [holstered], pointing it at the ground."),
span_notice("You draw \the [holstered], pointing it at the ground.")
)
if(holster_out)
@@ -120,12 +120,12 @@
H = locate() in S.accessories
if (!H)
to_chat(usr, "<span class='warning'>Something is very wrong.</span>")
to_chat(usr, span_warning("Something is very wrong."))
if(!H.holstered)
var/obj/item/W = usr.get_active_hand()
if(!istype(W, /obj/item))
to_chat(usr, "<span class='warning'>You need your gun equipped to holster it.</span>")
to_chat(usr, span_warning("You need your gun equipped to holster it."))
return
H.holster(W, usr)
else
@@ -168,4 +168,4 @@
/obj/item/clothing/accessory/holster/leg/black
desc = "A tacticool handgun holster. Worn on the upper leg."
icon_state = "holster_b_leg"
icon_state = "holster_b_leg"
code/modules/clothing/under/accessories/storage.dm
+1 -1
View File
@@ -42,7 +42,7 @@
..()
/obj/item/clothing/accessory/storage/attack_self(mob/user as mob)
to_chat(user, "<span class='notice'>You empty [src].</span>")
to_chat(user, span_notice("You empty [src]."))
var/turf/T = get_turf(src)
hold.hide_from(usr)
for(var/obj/item/I in hold.contents)
code/modules/clothing/under/jobs/security.dm
+1 -1
View File
@@ -102,7 +102,7 @@
item_state_slots[slot_w_uniform_str] = unrolled ? "[worn_state]_r" : initial(worn_state)
var/mob/living/carbon/human/H = loc
H.update_inv_w_uniform(1)
to_chat(H, "<span class='notice'>You roll the sleeves of your shirt [unrolled ? "up" : "down"]</span>")
to_chat(H, span_notice("You roll the sleeves of your shirt [unrolled ? "up" : "down"]"))
*/
/obj/item/clothing/under/det/grey
code/modules/clothing/under/miscellaneous_vr.dm
+11 -11
View File
@@ -73,7 +73,7 @@
return
if (src != H.w_uniform)
to_chat(H,"<span class='warning'>You must be WEARING the uniform to change your size.</span>")
to_chat(H,span_warning("You must be WEARING the uniform to change your size."))
return
var/new_size = tgui_input_number(usr, "Put the desired size (25-200%), or (1-600%) in dormitory areas.", "Set Size", 200, 600, 1)
@@ -82,20 +82,20 @@
//Check AGAIN because we accepted user input which is blocking.
if (src != H.w_uniform)
to_chat(H,"<span class='warning'>You must be WEARING the uniform to change your size.</span>")
to_chat(H,span_warning("You must be WEARING the uniform to change your size."))
return
if (H.stat || H.restrained())
return
if (isnull(H.size_multiplier)) // Why would this ever be the case?
to_chat(H,"<span class='warning'>The uniform panics and corrects your apparently microscopic size.</span>")
to_chat(H,span_warning("The uniform panics and corrects your apparently microscopic size."))
H.resize(RESIZE_NORMAL, ignore_prefs = TRUE)
H.update_icons() //Just want the matrix transform
return
if (!H.size_range_check(new_size))
to_chat(H,"<span class='notice'>The safety features of the uniform prevent you from choosing this size.</span>")
to_chat(H,span_notice("The safety features of the uniform prevent you from choosing this size."))
return
else if(new_size)
@@ -103,7 +103,7 @@
if(!original_size)
original_size = H.size_multiplier
H.resize(new_size/100, uncapped = H.has_large_resize_bounds(), ignore_prefs = TRUE) // Ignores prefs because you can only resize yourself
H.visible_message("<span class='warning'>The space around [H] distorts as they change size!</span>","<span class='notice'>The space around you distorts as you change size!</span>")
H.visible_message(span_warning("The space around [H] distorts as they change size!"),span_notice("The space around you distorts as you change size!"))
else //They chose their current size.
return
@@ -113,7 +113,7 @@
var/mob/living/carbon/human/H = M
H.resize(original_size, ignore_prefs = TRUE)
original_size = null
H.visible_message("<span class='warning'>The space around [H] distorts as they return to their original size!</span>","<span class='notice'>The space around you distorts as you return to your original size!</span>")
H.visible_message(span_warning("The space around [H] distorts as they return to their original size!"),span_notice("The space around you distorts as you return to your original size!"))
/obj/item/clothing/gloves/bluespace
name = "size standardization bracelet"
@@ -143,7 +143,7 @@
last_activated = world.time
original_size = H.size_multiplier
H.resize(target_size, uncapped = emagged, ignore_prefs = FALSE) //In case someone else tries to put it on you.
H.visible_message("<span class='warning'>The space around [H] distorts as they change size!</span>","<span class='notice'>The space around you distorts as you change size!</span>")
H.visible_message(span_warning("The space around [H] distorts as they change size!"),span_notice("The space around you distorts as you change size!"))
log_admin("Admin [key_name(M)]'s size was altered by a bluespace bracelet.")
/obj/item/clothing/gloves/bluespace/mob_can_unequip(mob/M, gloves, disable_warning = 0)
@@ -155,7 +155,7 @@
last_activated = world.time
H.resize(original_size, uncapped = emagged, ignore_prefs = FALSE)
original_size = null
H.visible_message("<span class='warning'>The space around [H] distorts as they return to their original size!</span>","<span class='notice'>The space around you distorts as you return to your original size!</span>")
H.visible_message(span_warning("The space around [H] distorts as they return to their original size!"),span_notice("The space around you distorts as you return to your original size!"))
log_admin("Admin [key_name(M)]'s size was altered by a bluespace bracelet.")
to_chat(M, "<span class ='warning'>\The [src] flickers. It is now recharging and will be ready again in thirty seconds.</span>")
@@ -164,9 +164,9 @@
var/cooldowntime = round((10 SECONDS - (world.time - last_activated)) * 0.1)
if(Adjacent(user))
if(cooldowntime >= 0)
. += "<span class='notice'>It appears to be recharging.</span>"
. += span_notice("It appears to be recharging.")
if(emagged)
. += "<span class='warning'>The crystal is flickering.</span>"
. += span_warning("The crystal is flickering.")
/obj/item/clothing/gloves/bluespace/emag_act(R_charges, var/mob/user, emag_source)
. = ..()
@@ -175,7 +175,7 @@
target_size = (rand(1,300)) /100
if(target_size < 0.1)
target_size = 0.1
user.visible_message("<span class='notice'>\The [user] swipes the [emag_source] over the \the [src].</span>","<span class='notice'>You swipes the [emag_source] over the \the [src].</span>")
user.visible_message(span_notice("\The [user] swipes the [emag_source] over the \the [src]."),span_notice("You swipes the [emag_source] over the \the [src]."))
return 1
/obj/item/clothing/gloves/bluespace/emagged