cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] refactors most spans (#9139)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
CHOMPStation2
2024-10-04 06:00:17 -07:00
committed by GitHub
parent 43ee646816
commit ab154b48b2
1511 changed files with 12497 additions and 12357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
code/game/objects/structures/crates_lockers/__closets.dm
View File

@@ -228,7 +228,7 @@
if(is_animating_door)
return
if(!(opened ? close() : open()))
to_chat(user, "<span class='notice'>It won't budge!</span>")
to_chat(user, span_notice("It won't budge!"))
return
// this should probably use dump_contents()
@@ -280,11 +280,11 @@
user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.")
if(do_after(user, 20 * W.toolspeed))
if(!src) return
to_chat(user, "<span class='notice'>You [anchored? "un" : ""]secured \the [src]!</span>")
to_chat(user, span_notice("You [anchored? "un" : ""]secured \the [src]!"))
anchored = !anchored
return
else
to_chat(user, "<span class='notice'>You can't reach the anchoring bolts when the door is closed!</span>")
to_chat(user, span_notice("You can't reach the anchoring bolts when the door is closed!"))
else if(opened)
if(istype(W, /obj/item/grab))
var/obj/item/grab/G = W
@@ -298,12 +298,12 @@
if(!WT.isOn())
return
else
to_chat(user, "<span class='notice'>You need more welding fuel to complete this task.</span>")
to_chat(user, span_notice("You need more welding fuel to complete this task."))
return
playsound(src, WT.usesound, 50)
new /obj/item/stack/material/steel(loc)
for(var/mob/M in viewers(src))
M.show_message("<span class='notice'>\The [src] has been cut apart by [user] with \the [WT].</span>", 3, "You hear welding.", 2)
M.show_message(span_notice("\The [src] has been cut apart by [user] with \the [WT]."), 3, "You hear welding.", 2)
qdel(src)
return
if(istype(W, /obj/item/storage/laundry_basket) && W.contents.len)
@@ -311,9 +311,9 @@
var/turf/T = get_turf(src)
for(var/obj/item/I in LB.contents)
LB.remove_from_storage(I, T)
user.visible_message("<span class='notice'>[user] empties \the [LB] into \the [src].</span>", \
"<span class='notice'>You empty \the [LB] into \the [src].</span>", \
"<span class='notice'>You hear rustling of clothes.</span>")
user.visible_message(span_notice("[user] empties \the [LB] into \the [src]."), \
span_notice("You empty \the [LB] into \the [src]."), \
span_notice("You hear rustling of clothes."))
return
if(isrobot(user))
return
@@ -333,7 +333,7 @@
if(!WT.isOn())
return
else
to_chat(user, "<span class='notice'>You need more welding fuel to complete this task.</span>")
to_chat(user, span_notice("You need more welding fuel to complete this task."))
return
if(do_after(user, 20 * S.toolspeed))
if(opened) //ChompEDIT - cancel weld if opened mid-progress to prevent welder-traps
@@ -342,7 +342,7 @@
sealed = !sealed
update_icon()
for(var/mob/M in viewers(src))
M.show_message("<span class='warning'>[src] has been [sealed?"sealed":"unsealed"] by [user.name].</span>", 3)
M.show_message(span_warning("[src] has been [sealed?"sealed":"unsealed"] by [user.name]."), 3)
else
attack_hand(user)
return
@@ -364,7 +364,7 @@
return
step_towards(O, loc)
if(user != O)
user.show_viewers("<span class='danger'>[user] stuffs [O] into [src]!</span>")
user.show_viewers(span_danger("[user] stuffs [O] into [src]!"))
add_fingerprint(user)
return
@@ -377,7 +377,7 @@
return
if(!open())
to_chat(user, "<span class='notice'>It won't budge!</span>")
to_chat(user, span_notice("It won't budge!"))
/obj/structure/closet/attack_hand(mob/user as mob)
add_fingerprint(user)
@@ -387,7 +387,7 @@
/obj/structure/closet/attack_self_tk(mob/user as mob)
add_fingerprint(user)
if(!toggle())
to_chat(usr, "<span class='notice'>It won't budge!</span>")
to_chat(usr, span_notice("It won't budge!"))
/obj/structure/closet/verb/verb_toggleopen()
set src in oview(1)
@@ -406,9 +406,9 @@
add_fingerprint(usr)
toggle(usr)
else
to_chat(usr, "<span class='warning'>This mob type can't use this verb.</span>") //VOREStation Addition End
to_chat(usr, span_warning("This mob type can't use this verb.")) //VOREStation Addition End
else
to_chat(usr, "<span class='warning'>This mob type can't use this verb.</span>")
to_chat(usr, span_warning("This mob type can't use this verb."))
/obj/structure/closet/update_icon()
if(opened)
@@ -420,7 +420,7 @@
if(damage < STRUCTURE_MIN_DAMAGE_THRESHOLD)
return
user.do_attack_animation(src)
visible_message("<span class='danger'>[user] [attack_message] the [src]!</span>")
visible_message(span_danger("[user] [attack_message] the [src]!"))
dump_contents()
spawn(1) qdel(src)
return 1
@@ -439,9 +439,9 @@
escapee.setClickCooldown(100)
//okay, so the closet is either sealed or locked... resist!!!
to_chat(escapee, "<span class='warning'>You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)</span>")
to_chat(escapee, span_warning("You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)"))
visible_message("<span class='danger'>\The [src] begins to shake violently!</span>")
visible_message(span_danger("\The [src] begins to shake violently!"))
breakout = 1 //can't think of a better way to do this right now.
for(var/i in 1 to (6*breakout_time * 2)) //minutes * 6 * 5seconds * 2
@@ -462,8 +462,8 @@
//Well then break it!
breakout = 0
to_chat(escapee, "<span class='warning'>You successfully break out!</span>")
visible_message("<span class='danger'>\The [escapee] successfully broke out of \the [src]!</span>")
to_chat(escapee, span_warning("You successfully break out!"))
visible_message(span_danger("\The [escapee] successfully broke out of \the [src]!"))
playsound(src, breakout_sound, 100, 1)
break_open()
animate_shake()
@@ -558,7 +558,7 @@
return
if(!(usr in src.contents))
to_chat(usr, "<span class='warning'>You need to be inside \the [src] to do this.</span>")
to_chat(usr, span_warning("You need to be inside \the [src] to do this."))
return
var/list/targets = list() //IF IT IS NOT BROKEN. DO NOT FIX IT.
@@ -572,7 +572,7 @@
targets += L
if(targets == 0)
to_chat(src, "<span class='notice'>No eligible targets found.</span>")
to_chat(src, span_notice("No eligible targets found."))
return
var/mob/living/target = tgui_input_list(usr, "Please select a target.", "Victim", targets)
@@ -581,11 +581,11 @@
return
if(!istype(target, /mob/living)) //Safety.
to_chat(src, "<span class='warning'>You need to select a living target!</span>")
to_chat(src, span_warning("You need to select a living target!"))
return
if (get_dist(src,target) >= 1 || get_dist(src,usr) >= 1) //in case they leave the locker
to_chat(src, "<span class='warning'>You are no longer both in \the [src].</span>")
to_chat(src, span_warning("You are no longer both in \the [src]."))
return
playsound(src, vore_sound, 25)

68
code/game/objects/structures/crates_lockers/closets/coffin.dm
View File

@@ -25,15 +25,15 @@
/obj/structure/closet/grave/attack_hand(mob/user as mob)
if(opened)
visible_message("<span class='notice'>[user] starts to climb into \the [src.name].</span>", \
"<span class='notice'>You start to lower yourself into \the [src.name].</span>")
visible_message(span_notice("[user] starts to climb into \the [src.name]."), \
span_notice("You start to lower yourself into \the [src.name]."))
if(do_after(user, 50))
user.forceMove(src.loc)
visible_message("<span class='notice'>[user] climbs into \the [src.name].</span>", \
"<span class='notice'>You climb into \the [src.name].</span>")
visible_message(span_notice("[user] climbs into \the [src.name]."), \
span_notice("You climb into \the [src.name]."))
else
visible_message("<span class='notice'>[user] decides not to climb into \the [src.name].</span>", \
"<span class='notice'>You stop climbing into \the [src.name].</span>")
visible_message(span_notice("[user] decides not to climb into \the [src.name]."), \
span_notice("You stop climbing into \the [src.name]."))
return
/obj/structure/closet/grave/CanPass(atom/movable/mover, turf/target)
@@ -43,19 +43,19 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.m_intent == "walk")
to_chat(H, "<span class='warning'>You stop at the edge of \the [src.name].</span>")
to_chat(H, span_warning("You stop at the edge of \the [src.name]."))
return FALSE
else
to_chat(H, "<span class='warning'>You fall into \the [src.name]!</span>")
to_chat(H, span_warning("You fall into \the [src.name]!"))
fall_in(H)
return TRUE
if(isrobot(M))
var/mob/living/silicon/robot/R = M
if(R.a_intent == I_HELP)
to_chat(R, "<span class='warning'>You stop at the edge of \the [src.name].</span>")
to_chat(R, span_warning("You stop at the edge of \the [src.name]."))
return FALSE
else
to_chat(R, "<span class='warning'>You enter \the [src.name].</span>")
to_chat(R, span_warning("You enter \the [src.name]."))
return TRUE
return TRUE //Everything else can move over the graves
@@ -69,17 +69,17 @@
/obj/structure/closet/grave/attackby(obj/item/W as obj, mob/user as mob)
if(src.opened)
if(istype(W, /obj/item/shovel))
user.visible_message("<span class='notice'>[user] piles dirt into \the [src.name].</span>", \
"<span class='notice'>You start to pile dirt into \the [src.name].</span>", \
"<span class='notice'>You hear dirt being moved.</span>")
user.visible_message(span_notice("[user] piles dirt into \the [src.name]."), \
span_notice("You start to pile dirt into \the [src.name]."), \
span_notice("You hear dirt being moved."))
if(do_after(user, 40 * W.toolspeed))
user.visible_message("<span class='notice'>[user] pats down the dirt on top of \the [src.name].</span>", \
"<span class='notice'>You finish filling in \the [src.name].</span>")
user.visible_message(span_notice("[user] pats down the dirt on top of \the [src.name]."), \
span_notice("You finish filling in \the [src.name]."))
close()
return
else
user.visible_message("<span class='notice'>[user] stops filling in \the [src.name].</span>", \
"<span class='notice'>You change your mind and stop filling in \the [src.name].</span>")
user.visible_message(span_notice("[user] stops filling in \the [src.name]."), \
span_notice("You change your mind and stop filling in \the [src.name]."))
return
if(istype(W, /obj/item/grab))
var/obj/item/grab/G = W
@@ -92,9 +92,9 @@
var/turf/T = get_turf(src)
for(var/obj/item/I in LB.contents)
LB.remove_from_storage(I, T)
user.visible_message("<span class='notice'>[user] empties \the [LB] into \the [src].</span>", \
"<span class='notice'>You empty \the [LB] into \the [src].</span>", \
"<span class='notice'>You hear rustling of clothes.</span>")
user.visible_message(span_notice("[user] empties \the [LB] into \the [src]."), \
span_notice("You empty \the [LB] into \the [src]."), \
span_notice("You hear rustling of clothes."))
return
if(isrobot(user))
return
@@ -106,33 +106,33 @@
else
if(istype(W, /obj/item/shovel))
if(user.a_intent == I_HURT) // Hurt intent means you're trying to kill someone, or just get rid of the grave
user.visible_message("<span class='notice'>[user] begins to smoothe out the dirt of \the [src.name].</span>", \
"<span class='notice'>You start to smoothe out the dirt of \the [src.name].</span>", \
"<span class='notice'>You hear dirt being moved.</span>")
user.visible_message(span_notice("[user] begins to smoothe out the dirt of \the [src.name]."), \
span_notice("You start to smoothe out the dirt of \the [src.name]."), \
span_notice("You hear dirt being moved."))
if(do_after(user, 40 * W.toolspeed))
user.visible_message("<span class='notice'>[user] finishes smoothing out \the [src.name].</span>", \
"<span class='notice'>You finish smoothing out \the [src.name].</span>")
user.visible_message(span_notice("[user] finishes smoothing out \the [src.name]."), \
span_notice("You finish smoothing out \the [src.name]."))
if(LAZYLEN(contents))
alpha = 40 // If we've got stuff inside, like maybe a person, just make it hard to see us
else
qdel(src) // Else, go away
return
else
user.visible_message("<span class='notice'>[user] stops concealing \the [src.name].</span>", \
"<span class='notice'>You stop concealing \the [src.name].</span>")
user.visible_message(span_notice("[user] stops concealing \the [src.name]."), \
span_notice("You stop concealing \the [src.name]."))
return
else
user.visible_message("<span class='notice'>[user] begins to unearth \the [src.name].</span>", \
"<span class='notice'>You start to unearth \the [src.name].</span>", \
"<span class='notice'>You hear dirt being moved.</span>")
user.visible_message(span_notice("[user] begins to unearth \the [src.name]."), \
span_notice("You start to unearth \the [src.name]."), \
span_notice("You hear dirt being moved."))
if(do_after(user, 40 * W.toolspeed))
user.visible_message("<span class='notice'>[user] reaches the bottom of \the [src.name].</span>", \
"<span class='notice'>You finish digging out \the [src.name].</span>")
user.visible_message(span_notice("[user] reaches the bottom of \the [src.name]."), \
span_notice("You finish digging out \the [src.name]."))
break_open()
return
else
user.visible_message("<span class='notice'>[user] stops digging out \the [src.name].</span>", \
"<span class='notice'>You stop digging out \the [src.name].</span>")
user.visible_message(span_notice("[user] stops digging out \the [src.name]."), \
span_notice("You stop digging out \the [src.name]."))
return
return

14
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
View File

@@ -48,7 +48,7 @@
if(large)
MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet
else
to_chat(user, "<span class='notice'>The locker is too small to stuff [G.affecting] into!</span>")
to_chat(user, span_notice("The locker is too small to stuff [G.affecting] into!"))
if(isrobot(user))
return
if(W.loc != user) // This should stop mounted modules ending up outside the module.
@@ -60,7 +60,7 @@
var/obj/item/card/id/I = W.GetID()
if(src.broken)
to_chat(user, "<span class='warning'>It appears to be broken.</span>")
to_chat(user, span_warning("It appears to be broken."))
return
if(!I || !I.registered_name) return
if(src.allowed(user) || !src.registered_name || (istype(I) && (src.registered_name == I.registered_name)))
@@ -71,7 +71,7 @@
src.registered_name = I.registered_name
src.desc = "Owned by [I.registered_name]."
else
to_chat(user, "<span class='warning'>Access Denied</span>")
to_chat(user, span_warning("Access Denied"))
else if(istype(W, /obj/item/melee/energy/blade))
if(emag_act(INFINITY, user, "The locker has been sliced open by [user] with \an [W]!", "You hear metal being sliced and sparks flying."))
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
@@ -80,7 +80,7 @@
playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
playsound(src, "sparks", 50, 1)
else
to_chat(user, "<span class='warning'>Access Denied</span>")
to_chat(user, span_warning("Access Denied"))
update_icon()
/obj/structure/closet/secure_closet/personal/emag_act(var/remaining_charges, var/mob/user, var/visual_feedback, var/audible_feedback)
@@ -90,7 +90,7 @@
desc = "It appears to be broken."
update_icon()
if(visual_feedback)
visible_message("<span class='warning'>[visual_feedback]</span>", "<span class='warning'>[audible_feedback]</span>")
visible_message(span_warning("[visual_feedback]"), span_warning("[audible_feedback]"))
return 1
/obj/structure/closet/secure_closet/personal/verb/reset()
@@ -102,9 +102,9 @@
if(ishuman(usr))
src.add_fingerprint(usr)
if (src.locked || !src.registered_name)
to_chat(usr, "<span class='warning'>You need to unlock it first.</span>")
to_chat(usr, span_warning("You need to unlock it first."))
else if (src.broken)
to_chat(usr, "<span class='warning'>It appears to be broken.</span>")
to_chat(usr, span_warning("It appears to be broken."))
else
if (src.opened)
if(!src.close())

24
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
View File

@@ -36,23 +36,23 @@
/obj/structure/closet/secure_closet/proc/togglelock(mob/user as mob)
if(opened)
to_chat(user, "<span class='notice'>Close the locker first.</span>")
to_chat(user, span_notice("Close the locker first."))
return
if(broken)
to_chat(user, "<span class='warning'>The locker appears to be broken.</span>")
to_chat(user, span_warning("The locker appears to be broken."))
return
if(user.loc == src)
to_chat(user, "<span class='notice'>You can't reach the lock from inside.</span>")
to_chat(user, span_notice("You can't reach the lock from inside."))
return
if(allowed(user))
locked = !locked
playsound(src, 'sound/machines/click.ogg', 15, 1, -3)
for(var/mob/O in viewers(user, 3))
if((O.client && !( O.blinded )))
to_chat(O, "<span class='notice'>The locker has been [locked ? null : "un"]locked by [user].</span>")
to_chat(O, span_notice("The locker has been [locked ? null : "un"]locked by [user]."))
update_icon()
else
to_chat(user, "<span class='notice'>Access Denied</span>")
to_chat(user, span_notice("Access Denied"))
/obj/structure/closet/secure_closet/attackby(obj/item/W as obj, mob/user as mob)
if(W.has_tool_quality(TOOL_WRENCH))
@@ -63,11 +63,11 @@
user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.")
if(do_after(user, 20 * W.toolspeed))
if(!src) return
to_chat(user, "<span class='notice'>You [anchored? "un" : ""]secured \the [src]!</span>")
to_chat(user, span_notice("You [anchored? "un" : ""]secured \the [src]!"))
anchored = !anchored
return
else
to_chat(user, "<span class='notice'>You can't reach the anchoring bolts when the door is closed!</span>")
to_chat(user, span_notice("You can't reach the anchoring bolts when the door is closed!"))
else if(opened)
if(istype(W, /obj/item/storage/laundry_basket))
return ..(W,user)
@@ -76,7 +76,7 @@
if(large)
MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet
else
to_chat(user, "<span class='notice'>The locker is too small to stuff [G.affecting] into!</span>")
to_chat(user, span_notice("The locker is too small to stuff [G.affecting] into!"))
if(isrobot(user))
return
if(W.loc != user) // This should stop mounted modules ending up outside the module.
@@ -85,7 +85,7 @@
if(W)
W.forceMove(loc)
else if(istype(W, /obj/item/melee/energy/blade))
if(emag_act(INFINITY, user, "<span class='danger'>The locker has been sliced open by [user] with \an [W]</span>!", "<span class='danger'>You hear metal being sliced and sparks flying.</span>"))
if(emag_act(INFINITY, user, span_danger("The locker has been sliced open by [user] with \an [W]!"), span_danger("You hear metal being sliced and sparks flying.")))
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, loc)
spark_system.start()
@@ -105,9 +105,9 @@
if(visual_feedback)
visible_message(visual_feedback, audible_feedback)
else if(user && emag_source)
visible_message("<span class='warning'>\The [src] has been broken by \the [user] with \an [emag_source]!</span>", "You hear a faint electrical spark.")
visible_message(span_warning("\The [src] has been broken by \the [user] with \an [emag_source]!"), "You hear a faint electrical spark.")
else
visible_message("<span class='warning'>\The [src] sparks and breaks open!</span>", "You hear a faint electrical spark.")
visible_message(span_warning("\The [src] sparks and breaks open!"), "You hear a faint electrical spark.")
update_icon()
return 1
@@ -134,7 +134,7 @@
add_fingerprint(usr)
togglelock(usr)
else
to_chat(usr, "<span class='warning'>This mob type can't use this verb.</span>")
to_chat(usr, span_warning("This mob type can't use this verb."))
/obj/structure/closet/secure_closet/update_icon()
if(opened)

4
code/game/objects/structures/crates_lockers/closets/statue.dm
View File

@@ -106,7 +106,7 @@
/obj/structure/closet/statue/attackby(obj/item/I as obj, mob/user as mob)
health -= I.force
user.do_attack_animation(src)
visible_message("<span class='danger'>[user] strikes [src] with [I].</span>")
visible_message(span_danger("[user] strikes [src] with [I]."))
check_health()
/obj/structure/closet/statue/MouseDrop_T()
@@ -128,5 +128,5 @@
if (user)
user.dust()
dump_contents()
visible_message("<span class='warning'>[src] shatters!.</span>")
visible_message(span_warning("[src] shatters!."))
qdel(src)

20
code/game/objects/structures/crates_lockers/crates.dm
View File

@@ -115,21 +115,21 @@
else if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = W
if(rigged)
to_chat(user, "<span class='notice'>[src] is already rigged!</span>")
to_chat(user, span_notice("[src] is already rigged!"))
return
if (C.use(1))
to_chat(user , "<span class='notice'>You rig [src].</span>")
to_chat(user , span_notice("You rig [src]."))
rigged = 1
return
else if(istype(W, /obj/item/radio/electropack))
if(rigged)
to_chat(user , "<span class='notice'>You attach [W] to [src].</span>")
to_chat(user , span_notice("You attach [W] to [src]."))
user.drop_item()
W.forceMove(src)
return
else if(W.has_tool_quality(TOOL_WIRECUTTER))
if(rigged)
to_chat(user , "<span class='notice'>You cut away the wiring.</span>")
to_chat(user , span_notice("You cut away the wiring."))
playsound(src, W.usesound, 100, 1)
rigged = 0
return
@@ -179,15 +179,15 @@
/obj/structure/closet/crate/secure/proc/togglelock(mob/user as mob)
if(src.opened)
to_chat(user, "<span class='notice'>Close the crate first.</span>")
to_chat(user, span_notice("Close the crate first."))
return
if(src.broken)
to_chat(user, "<span class='warning'>The crate appears to be broken.</span>")
to_chat(user, span_warning("The crate appears to be broken."))
return
if(src.allowed(user))
set_locked(!locked, user)
else
to_chat(user, "<span class='notice'>Access Denied</span>")
to_chat(user, span_notice("Access Denied"))
/obj/structure/closet/crate/secure/proc/set_locked(var/newlocked, mob/user = null)
if(locked == newlocked) return
@@ -195,7 +195,7 @@
locked = newlocked
if(user)
for(var/mob/O in viewers(user, 3))
O.show_message( "<span class='notice'>The crate has been [locked ? null : "un"]locked by [user].</span>", 1)
O.show_message( span_notice("The crate has been [locked ? null : "un"]locked by [user]."), 1)
update_icon()
/obj/structure/closet/crate/secure/verb/verb_togglelock()
@@ -210,7 +210,7 @@
src.add_fingerprint(usr)
src.togglelock(usr)
else
to_chat(usr, "<span class='warning'>This mob type can't use this verb.</span>")
to_chat(usr, span_warning("This mob type can't use this verb."))
/obj/structure/closet/crate/secure/attack_hand(mob/user as mob)
src.add_fingerprint(user)
@@ -234,7 +234,7 @@
playsound(src, "sparks", 60, 1)
locked = 0
broken = 1
to_chat(user, "<span class='notice'>You unlock \the [src].</span>")
to_chat(user, span_notice("You unlock \the [src]."))
update_icon()
return 1

10
code/game/objects/structures/crates_lockers/largecrate.dm
View File

@@ -18,13 +18,13 @@
update_icon()
/obj/structure/largecrate/attack_hand(mob/user as mob)
to_chat(user, "<span class='notice'>You need a crowbar to pry this open!</span>")
to_chat(user, span_notice("You need a crowbar to pry this open!"))
return
/obj/structure/largecrate/attackby(obj/item/W as obj, mob/user as mob)
var/turf/T = get_turf(src)
if(!T)
to_chat(user, "<span class='notice'>You can't open this here!</span>")
to_chat(user, span_notice("You can't open this here!"))
if(W.has_tool_quality(TOOL_CROWBAR))
new /obj/item/stack/material/wood(src)
@@ -39,9 +39,9 @@
AMBLINAL.ghostjoin_icon()
active_ghost_pods |= AMBLINAL
//VOREStation Add End
user.visible_message("<span class='notice'>[user] pries \the [src] open.</span>", \
"<span class='notice'>You pry open \the [src].</span>", \
"<span class='notice'>You hear splitting wood.</span>")
user.visible_message(span_notice("[user] pries \the [src] open."), \
span_notice("You pry open \the [src]."), \
span_notice("You hear splitting wood."))
qdel(src)
else
return attack_hand(user)

6
code/game/objects/structures/crates_lockers/largecrate_vr.dm
View File

@@ -29,9 +29,9 @@
var/turf/T = get_turf(src)
for(var/atom/movable/AM in contents)
if(AM.simulated) AM.forceMove(T)
user.visible_message("<span class='notice'>[user] pries \the [src] open.</span>", \
"<span class='notice'>You pry open \the [src].</span>", \
"<span class='notice'>You hear splitting wood.</span>")
user.visible_message(span_notice("[user] pries \the [src] open."), \
span_notice("You pry open \the [src]."), \
span_notice("You hear splitting wood."))
qdel(src)
else
return attack_hand(user)

22
code/game/objects/structures/crates_lockers/vehiclecage.dm
View File

@@ -11,7 +11,7 @@
/obj/structure/vehiclecage/examine(mob/user)
. = ..()
if(my_vehicle)
. += "<span class='notice'>It seems to contain \the [my_vehicle].</span>"
. += span_notice("It seems to contain \the [my_vehicle].")
/obj/structure/vehiclecage/Initialize()
. = ..()
@@ -24,21 +24,21 @@
update_icon()
/obj/structure/vehiclecage/attack_hand(mob/user as mob)
to_chat(user, "<span class='notice'>You need a wrench to take this apart!</span>")
to_chat(user, span_notice("You need a wrench to take this apart!"))
return
/obj/structure/vehiclecage/attackby(obj/item/W as obj, mob/user as mob)
var/turf/T = get_turf(src)
if(!T)
to_chat(user, "<span class='notice'>You can't open this here!</span>")
to_chat(user, span_notice("You can't open this here!"))
if(W.has_tool_quality(TOOL_WRENCH) && do_after(user, 60 * W.toolspeed, src))
playsound(src, W.usesound, 50, 1)
disassemble(W, user)
user.visible_message("<span class='notice'>[user] begins loosening \the [src]'s bolts.</span>")
user.visible_message(span_notice("[user] begins loosening \the [src]'s bolts."))
if(W.has_tool_quality(TOOL_WIRECUTTER) && do_after(user, 70 * W.toolspeed, src))
playsound(src, W.usesound, 50, 1)
disassemble(W, user)
user.visible_message("<span class='notice'>[user] begins cutting \the [src]'s bolts.</span>")
user.visible_message(span_notice("[user] begins cutting \the [src]'s bolts."))
else
return attack_hand(user)
@@ -72,9 +72,9 @@
/obj/structure/vehiclecage/proc/load_vehicle(var/obj/vehicle/V, mob/user as mob)
if(user)
user.visible_message("<span class='notice'>[user] loads \the [V] into \the [src].</span>", \
"<span class='notice'>You load \the [V] into \the [src].</span>", \
"<span class='notice'>You hear creaking metal.</span>")
user.visible_message(span_notice("[user] loads \the [V] into \the [src]."), \
span_notice("You load \the [V] into \the [src]."), \
span_notice("You hear creaking metal."))
V.forceMove(src)
@@ -91,9 +91,9 @@
AM.forceMove(T)
my_vehicle = null
user.visible_message("<span class='notice'>[user] release \the [src].</span>", \
"<span class='notice'>You finally release \the [src].</span>", \
"<span class='notice'>You hear creaking metal.</span>")
user.visible_message(span_notice("[user] release \the [src]."), \
span_notice("You finally release \the [src]."), \
span_notice("You hear creaking metal."))
qdel(src)
/obj/structure/vehiclecage/spacebike