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

rid of old span macros

Browse Source
This commit is contained in:
Kashargul
2024-10-01 23:51:48 +02:00
parent ded60639bc
commit e0d694e8ac
205 changed files with 862 additions and 868 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/landmarks_events.dm
+2 -2
View File
@@ -70,7 +70,7 @@ Admin verb is called by code\modules\admin\verbs\event_triggers.dm
else
if(isLoud)
creator_reference << 'sound/effects/adminhelp.ogg'
to_chat(creator_reference, SPAN_WARNING("Player [L.name] ([L.ckey]) has triggered event \
to_chat(creator_reference, span_warning("Player [L.name] ([L.ckey]) has triggered event \
narrate landmark [name] of type [isNarrate ? "Narration" : "Notification"]. \n \
It [isRepeating ? "will be possible to trigger after [cooldown / (1 SECOND)] seconds" : "has self-deleted"] \n \
COORDINATES: [coordinates]"))
@@ -118,7 +118,7 @@ Admin verb is called by code\modules\admin\verbs\event_triggers.dm
switch(isPersonal_orVis_orAud)
if(0)
if(isWarning)
to_chat(L, SPAN_DANGER(message))
to_chat(L, span_danger(message))
else
to_chat(L, message)
if(1)
code/game/objects/effects/spiders.dm
+1 -1
View File
@@ -82,7 +82,7 @@
return TRUE
else if(istype(mover, /mob/living))
if(prob(50))
to_chat(mover, span("warning", "You get stuck in \the [src] for a moment."))
to_chat(mover, span_warning("You get stuck in \the [src] for a moment."))
return FALSE
else if(istype(mover, /obj/item/projectile))
return prob(30)
code/game/objects/items.dm
+2 -2
View File
@@ -228,7 +228,7 @@
if (!user) return
..()
if(anchored)
to_chat(user, span("notice", "\The [src] won't budge, you can't pick it up!"))
to_chat(user, span_notice("\The [src] won't budge, you can't pick it up!"))
return
if (hasorgans(user))
var/mob/living/carbon/human/H = user
@@ -574,7 +574,7 @@ var/list/global/slot_flags_enumeration = list(
if(!hit_zone)
U.do_attack_animation(M)
playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
visible_message(SPAN_DANGER("\The [U] attempts to stab \the [M] in the eyes, but misses!"))
visible_message(span_danger("\The [U] attempts to stab \the [M] in the eyes, but misses!"))
return
add_attack_logs(user,M,"Attack eyes with [name]")
code/game/objects/items/devices/aicard.dm
+1 -1
View File
@@ -113,7 +113,7 @@
return 0
user.visible_message("\The [user] starts transferring \the [ai] into \the [src]...", "You start transferring \the [ai] into \the [src]...")
show_message(span("critical", "\The [user] is transferring you into \the [src]!"))
show_message(span_critical("\The [user] is transferring you into \the [src]!"))
if(do_after(user, 100))
if(carded_ai)
code/game/objects/items/devices/gps.dm
+5 -5
View File
@@ -229,7 +229,7 @@ var/list/GPS_list = list()
/obj/item/gps/proc/display(mob/user)
if(emped)
to_chat(user, SPAN_WARNING("It's busted!"))
to_chat(user, span_warning("It's busted!"))
return
var/list/dat = list()
@@ -290,7 +290,7 @@ var/list/GPS_list = list()
LAZYSET(showing_tracked_names, gps_ref, TRUE)
else
LAZYREMOVE(showing_tracked_names, gps_ref)
to_chat(usr, SPAN_NOTICE("\The [src] is [LAZYACCESS(showing_tracked_names, gps_ref) ? "now showing" : "no longer showing"] labels for [gps.gps_tag]."))
to_chat(usr, span_notice("\The [src] is [LAZYACCESS(showing_tracked_names, gps_ref) ? "now showing" : "no longer showing"] labels for [gps.gps_tag]."))
if(href_list["stop_track"])
var/gps_ref = href_list["stop_track"]
@@ -299,7 +299,7 @@ var/list/GPS_list = list()
LAZYREMOVE(tracking_devices, gps_ref)
LAZYREMOVE(showing_tracked_names, gps_ref)
if(istype(gps) && !QDELETED(gps))
to_chat(usr, SPAN_NOTICE("\The [src] is no longer tracking [gps.gps_tag]."))
to_chat(usr, span_notice("\The [src] is no longer tracking [gps.gps_tag]."))
update_compass()
. = TRUE
@@ -309,7 +309,7 @@ var/list/GPS_list = list()
if(istype(gps) && !QDELETED(gps))
LAZYSET(tracking_devices, gps_ref, "#00ffff")
LAZYSET(showing_tracked_names, gps_ref, TRUE)
to_chat(usr, SPAN_NOTICE("\The [src] is now tracking [gps.gps_tag]."))
to_chat(usr, span_notice("\The [src] is now tracking [gps.gps_tag]."))
update_compass()
. = TRUE
@@ -318,7 +318,7 @@ var/list/GPS_list = list()
if(istype(gps) && !QDELETED(gps))
var/new_colour = input(usr, "Enter a new tracking color.", "GPS Waypoint Color") as color|null
if(new_colour && istype(gps) && !QDELETED(gps) && holder == usr && !usr.incapacitated())
to_chat(usr, SPAN_NOTICE("You adjust the colour \the [src] is using to highlight [gps.gps_tag]."))
to_chat(usr, span_notice("You adjust the colour \the [src] is using to highlight [gps.gps_tag]."))
LAZYSET(tracking_devices, href_list["track_color"], new_colour)
update_compass()
. = TRUE
code/game/objects/items/devices/scanners/reagents.dm
+5 -5
View File
@@ -23,20 +23,20 @@
if(!isnull(O.reagents))
if(!(O.flags & OPENCONTAINER)) // The idea is that the scanner has to touch the reagents somehow. This is done to prevent cheesing unidentified autoinjectors.
to_chat(user, span("warning", "\The [O] is sealed, and cannot be scanned by \the [src] until unsealed."))
to_chat(user, span_warning("\The [O] is sealed, and cannot be scanned by \the [src] until unsealed."))
return
var/dat = ""
if(O.reagents.reagent_list.len > 0)
var/one_percent = O.reagents.total_volume / 100
for (var/datum/reagent/R in O.reagents.reagent_list)
dat += "\n \t " + span("notice", "[R][details ? ": [R.volume / one_percent]%" : ""]")
dat += "\n \t " + span_notice("[R][details ? ": [R.volume / one_percent]%" : ""]")
if(dat)
to_chat(user, span("notice", "Chemicals found: [dat]"))
to_chat(user, span_notice("Chemicals found: [dat]"))
else
to_chat(user, span("notice", "No active chemical agents found in [O]."))
to_chat(user, span_notice("No active chemical agents found in [O]."))
else
to_chat(user, span("notice", "No significant chemical agents found in [O]."))
to_chat(user, span_notice("No significant chemical agents found in [O]."))
return
code/game/objects/items/magazine.dm
+1 -1
View File
@@ -86,7 +86,7 @@
to_chat(user, "The headline screams, \"[headline]\"")
/obj/item/tabloid/attack_self(mob/user)
user.visible_message(SPAN_NOTICE("\The [user] leafs idly through \the [src]."))
user.visible_message(span_notice("\The [user] leafs idly through \the [src]."))
if(headline)
to_chat(user, "Most of it is the usual tabloid garbage, but the headline story, \"[headline]\", holds your attention for awhile.")
if(tabloid_headlines[headline])
code/game/objects/items/weapons/RCD.dm
+9 -9
View File
@@ -31,7 +31,7 @@
var/make_rwalls = FALSE // If true, when building walls, they will be reinforced.
/* VOREStation Removal - Unused
/obj/item/rcd/Initialize()
src.spark_system = new /datum/effect/effect/system/spark_spread
spark_system.set_up(5, 0, src)
spark_system.attach(src)
@@ -56,13 +56,13 @@
if(istype(W, /obj/item/rcd_ammo))
var/obj/item/rcd_ammo/cartridge = W
if((stored_matter + cartridge.remaining) > max_stored_matter)
to_chat(user, span("warning", "The RCD can't hold that many additional matter-units."))
to_chat(user, span_warning("The RCD can't hold that many additional matter-units."))
return FALSE
stored_matter += cartridge.remaining
user.drop_from_inventory(W)
qdel(W)
playsound(src, 'sound/machines/click.ogg', 50, 1)
to_chat(user, span("notice", "The RCD now holds [stored_matter]/[max_stored_matter] matter-units."))
to_chat(user, span_notice("The RCD now holds [stored_matter]/[max_stored_matter] matter-units."))
return TRUE
return ..()
*/
@@ -74,7 +74,7 @@
else
mode_index++
to_chat(user, span("notice", "Changed mode to '[modes[mode_index]]'."))
to_chat(user, span_notice("Changed mode to '[modes[mode_index]]'."))
playsound(src, 'sound/effects/pop.ogg', 50, 0)
if(prob(20))
@@ -99,16 +99,16 @@
// Used to call rcd_act() on the atom hit.
/obj/item/rcd/proc/use_rcd(atom/A, mob/living/user)
if(busy && !allow_concurrent_building)
to_chat(user, span("warning", "\The [src] is busy finishing its current operation, be patient."))
to_chat(user, span_warning("\The [src] is busy finishing its current operation, be patient."))
return FALSE
var/list/rcd_results = A.rcd_values(user, src, modes[mode_index])
if(!rcd_results)
to_chat(user, span("warning", "\The [src] blinks a red light as you point it towards \the [A], indicating \
to_chat(user, span_warning("\The [src] blinks a red light as you point it towards \the [A], indicating \
that it won't work. Try changing the mode, or use it on something else."))
return FALSE
if(!can_afford(rcd_results[RCD_VALUE_COST]))
to_chat(user, span("warning", "\The [src] lacks the required material to start."))
to_chat(user, span_warning("\The [src] lacks the required material to start."))
return FALSE
playsound(src, 'sound/machines/click.ogg', 50, 1)
@@ -128,7 +128,7 @@
busy = FALSE
// Doing another check in case we lost matter during the delay for whatever reason.
if(!can_afford(rcd_results[RCD_VALUE_COST]))
to_chat(user, span("warning", "\The [src] lacks the required material to finish the operation."))
to_chat(user, span_warning("\The [src] lacks the required material to finish the operation."))
return FALSE
if(A.rcd_act(user, src, rcd_results[RCD_VALUE_MODE]))
consume_resources(rcd_results[RCD_VALUE_COST])
@@ -289,7 +289,7 @@
/obj/item/rcd/debug/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/rcd_ammo))
to_chat(user, span("notice", "\The [src] makes its own material, no need to add more."))
to_chat(user, span_notice("\The [src] makes its own material, no need to add more."))
return FALSE
return ..()
code/game/objects/items/weapons/RCD_vr.dm
+3 -3
View File
@@ -69,16 +69,16 @@
var/obj/item/rcd_ammo/cartridge = W
var/can_store = min(max_stored_matter - stored_matter, cartridge.remaining)
if(can_store <= 0)
to_chat(user, span("warning", "There's either no space or \the [cartridge] is empty!"))
to_chat(user, span_warning("There's either no space or \the [cartridge] is empty!"))
return FALSE
stored_matter += can_store
cartridge.remaining -= can_store
if(!cartridge.remaining)
to_chat(user, span("warning", "\The [cartridge] dissolves as it empties of compressed matter."))
to_chat(user, span_warning("\The [cartridge] dissolves as it empties of compressed matter."))
user.drop_from_inventory(W)
qdel(W)
playsound(src, 'sound/machines/click.ogg', 50, 1)
to_chat(user, span("notice", "The RCD now holds [stored_matter]/[max_stored_matter] matter-units."))
to_chat(user, span_notice("The RCD now holds [stored_matter]/[max_stored_matter] matter-units."))
update_icon()
return TRUE
return ..()
code/game/objects/items/weapons/RMS_vr.dm
+1 -1
View File
@@ -238,7 +238,7 @@
else
return
to_chat(user, span("notice", "Changed mode to '[choice]'."))
to_chat(user, span_notice("Changed mode to '[choice]'."))
playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
return ..()
code/game/objects/items/weapons/capture_crystal.dm
+1 -1
View File
@@ -64,7 +64,7 @@
AI.hostile = !AI.hostile
if(!AI.hostile)
AI.set_stance(STANCE_IDLE)
to_chat(M, span("notice", "\The [bound_mob] is now [AI.hostile ? "hostile" : "passive"]."))
to_chat(M, span_notice("\The [bound_mob] is now [AI.hostile ? "hostile" : "passive"]."))
log_admin("[key_name_admin(M)] set [bound_mob] to [AI.hostile].")
else if(bound_mob.client)
var/transmit_msg = tgui_input_text(usr, "What is your command?", "Command")
code/game/objects/items/weapons/chewables.dm
+3 -3
View File
@@ -15,7 +15,7 @@
/obj/item/clothing/mask/chewable/attack_self(mob/user)
if(wrapped)
wrapped = FALSE
to_chat(user, span("notice", "You unwrap \the [name]."))
to_chat(user, span_notice("You unwrap \the [name]."))
playsound(src.loc, 'sound/items/drop/wrapper.ogg', 50, 1)
slot_flags = SLOT_EARS | SLOT_MASK
update_icon()
@@ -41,7 +41,7 @@
if(C.check_has_mouth())
START_PROCESSING(SSprocessing, src)
else
to_chat(user, span("notice", "You don't have a mouth, and can't make much use of \the [src]."))
to_chat(user, span_notice("You don't have a mouth, and can't make much use of \the [src]."))
/obj/item/clothing/mask/chewable/dropped()
STOP_PROCESSING(SSprocessing, src)
@@ -90,7 +90,7 @@
if(ismob(loc))
var/mob/living/M = loc
if(!no_message)
to_chat(M, SPAN_NOTICE("The [name] runs out of flavor."))
to_chat(M, span_notice("The [name] runs out of flavor."))
if(M.wear_mask)
M.remove_from_mob(src) //un-equip it so the overlays can update
M.update_inv_wear_mask(0)
code/game/objects/items/weapons/implants/implantchair.dm
+1 -1
View File
@@ -73,7 +73,7 @@
if(!ismob(grab.affecting))
return
if(grab.affecting.has_buckled_mobs())
to_chat(user, span("warning", "\The [grab.affecting] has other entities attached to them. Remove them first."))
to_chat(user, span_warning("\The [grab.affecting] has other entities attached to them. Remove them first."))
return
var/mob/M = grab.affecting
if(put_mob(M))
code/game/objects/items/weapons/material/kitchen.dm
+5 -5
View File
@@ -46,16 +46,16 @@
/obj/item/material/kitchen/utensil/proc/load_food(var/mob/user, var/obj/item/reagent_containers/food/snacks/loading)
if (reagents.total_volume > 0)
to_chat(user, SPAN_DANGER("There is already something on \the [src]."))
to_chat(user, span_danger("There is already something on \the [src]."))
return
if (!loading?.reagents?.total_volume)
to_chat(user, SPAN_NOTICE("Nothing to scoop up in \the [loading]!"))
to_chat(user, span_notice("Nothing to scoop up in \the [loading]!"))
loaded = "\the [loading]"
user.visible_message( \
"<b>\The [user]</b> scoops up some of [loaded] with \the [src]!",
SPAN_NOTICE("You scoop up some of [loaded] with \the [src]!")
span_notice("You scoop up some of [loaded] with \the [src]!")
)
loading.bitecount++
loading.reagents.trans_to_obj(src, min(loading.reagents.total_volume, scoop_volume))
@@ -110,7 +110,7 @@
return
M.visible_message("<b>\The [user]</b> eats some of [loaded] with \the [src].")
else
user.visible_message(SPAN_WARNING("\The [user] begins to feed \the [M]!"))
user.visible_message(span_warning("\The [user] begins to feed \the [M]!"))
if(!(M.can_force_feed(user, loaded) && do_mob(user, M, 5 SECONDS)))
return
M.visible_message("<b>\The [user]</b> feeds some of [loaded] to \the [M] with \the [src].")
@@ -119,7 +119,7 @@
update_icon()
return
else
to_chat(user, SPAN_WARNING("You don't have anything on \the [src].")) //if we have help intent and no food scooped up DON'T STAB OURSELVES WITH THE FORK
to_chat(user, span_warning("You don't have anything on \the [src].")) //if we have help intent and no food scooped up DON'T STAB OURSELVES WITH THE FORK
return
/obj/item/material/kitchen/utensil/on_rag_wipe()
code/game/objects/items/weapons/material/misc.dm
+2 -2
View File
@@ -87,12 +87,12 @@
/obj/item/material/snow/snowball/attack_self(mob/user as mob)
if(user.a_intent == I_HURT)
to_chat(user, SPAN_NOTICE("You smash the snowball in your hand."))
to_chat(user, span_notice("You smash the snowball in your hand."))
var/atom/S = new /obj/item/stack/material/snow(user.loc)
qdel(src)
user.put_in_hands(S)
else
to_chat(user, SPAN_NOTICE("You start compacting the snowball."))
to_chat(user, span_notice("You start compacting the snowball."))
if(do_after(user, 2 SECONDS))
var/atom/S = new /obj/item/material/snow/snowball/reinforced(user.loc)
qdel(src)
code/game/objects/items/weapons/picnic_blankets.dm
+3 -3
View File
@@ -66,7 +66,7 @@
continue
if(LAZYLEN(T.contents) > 20) //Avoiding potential perf issues by not iterating over large piles of objs
if(!anti_spam)
to_chat(usr, SPAN_NOTICE("Too many items! Couldn't fully unfold the blanket!"))
to_chat(usr, span_notice("Too many items! Couldn't fully unfold the blanket!"))
anti_spam = TRUE
continue
for(var/obj/O in T)
@@ -101,9 +101,9 @@
/obj/structure/picnic_blanket_deployed/examine(mob/user)
. = ..()
if(blanket_type == CENTER)
. += SPAN_NOTICE("This is the center of a folded out picnic blanket. You can use this to start packing it up!")
. += span_notice("This is the center of a folded out picnic blanket. You can use this to start packing it up!")
if(blanket_type == SIDE)
. += SPAN_NOTICE("This is one of the edges. Look for the center to start packing!")
. += span_notice("This is one of the edges. Look for the center to start packing!")
//For Mapping use only.
//If player folds it back up, it reverts to normal type so the Initialize() won't cause issues
code/game/objects/items/weapons/policetape.dm
+1 -1
View File
@@ -322,7 +322,7 @@ var/list/tape_roll_applications = list()
var/mob/M = mover
add_fingerprint(M)
if(!allowed(M)) //only select few learn art of not crumpling the tape
to_chat(M, span("warning", "You are not supposed to go past \the [src]..."))
to_chat(M, span_warning("You are not supposed to go past \the [src]..."))
if(M.a_intent == I_HELP && !(istype(M, /mob/living/simple_mob)))
return FALSE
crumple()
code/game/objects/items/weapons/storage/boxes.dm
+2 -2
View File
@@ -60,10 +60,10 @@
//try to crush it
if(ispath(trash))
if(contents.len && user.a_intent == I_HURT) // only crumple with things inside on harmintent.
user.visible_message(SPAN_DANGER("[user] crushes \the [src], spilling its contents everywhere!"), SPAN_DANGER("You crush \the [src], spilling its contents everywhere!"))
user.visible_message(span_danger("[user] crushes \the [src], spilling its contents everywhere!"), span_danger("You crush \the [src], spilling its contents everywhere!"))
spill()
else
to_chat(user, SPAN_NOTICE("You crumple up \the [src].")) //make trash
to_chat(user, span_notice("You crumple up \the [src].")) //make trash
playsound(src.loc, 'sound/items/drop/wrapper.ogg', 30, 1)
var/obj/item/trash = new src.trash()
qdel(src)
code/game/objects/structures/cliff.dm
+7 -7
View File
@@ -204,9 +204,9 @@ two tiles on initialization, and which way a cliff is facing may change during m
safe_fall = H.species.handle_falling(H, T, silent = TRUE, planetary = FALSE)
if(safe_fall)
visible_message(span("notice", "\The [L] glides down from \the [src]."))
visible_message(span_notice("\The [L] glides down from \the [src]."))
else
visible_message(span("danger", "\The [L] falls off \the [src]!"))
visible_message(span_danger("\The [L] falls off \the [src]!"))
L.forceMove(T)
var/harm = !is_double_cliff ? 1 : 0.5
@@ -215,7 +215,7 @@ two tiles on initialization, and which way a cliff is facing may change during m
if(istype(L.buckled, /obj/vehicle)) // People falling off in vehicles will take less damage, but will damage the vehicle severely.
var/obj/vehicle/vehicle = L.buckled
vehicle.adjust_health(40 * harm)
to_chat(L, span("warning", "\The [vehicle] absorbs some of the impact, damaging it."))
to_chat(L, span_warning("\The [vehicle] absorbs some of the impact, damaging it."))
harm /= 2
playsound(L, 'sound/effects/break_stone.ogg', 70, 1)
@@ -228,14 +228,14 @@ two tiles on initialization, and which way a cliff is facing may change during m
sleep(fall_time) // A brief delay inbetween the two sounds helps sell the 'ouch' effect.
if(safe_fall)
visible_message(span("notice", "\The [L] lands on \the [T]."))
visible_message(span_notice("\The [L] lands on \the [T]."))
playsound(L, "rustle", 25, 1)
return
playsound(L, "punch", 70, 1)
shake_camera(L, 1, 1)
visible_message(span("danger", "\The [L] hits \the [T]!"))
visible_message(span_danger("\The [L] hits \the [T]!"))
// The bigger they are, the harder they fall.
// They will take at least 20 damage at the minimum, and tries to scale up to 40% of their max health.
@@ -250,7 +250,7 @@ two tiles on initialization, and which way a cliff is facing may change during m
// Now fall off more cliffs below this one if they exist.
var/obj/structure/cliff/bottom_cliff = locate() in T
if(bottom_cliff)
visible_message(span("danger", "\The [L] rolls down towards \the [bottom_cliff]!"))
visible_message(span_danger("\The [L] rolls down towards \the [bottom_cliff]!"))
sleep(5)
bottom_cliff.fall_off_cliff(L)
@@ -262,7 +262,7 @@ two tiles on initialization, and which way a cliff is facing may change during m
if(shoes && shoes.rock_climbing)
return ..() // Do the other checks too.
to_chat(user, span("warning", "\The [src] is too steep to climb unassisted."))
to_chat(user, span_warning("\The [src] is too steep to climb unassisted."))
return FALSE
// This tells AI mobs to not be dumb and step off cliffs willingly.
code/game/objects/structures/fence.dm
+13 -13
View File
@@ -71,30 +71,30 @@
/obj/structure/fence/attackby(obj/item/W, mob/user)
if(W.has_tool_quality(TOOL_WIRECUTTER))
if(!cuttable)
to_chat(user, span("warning", "This section of the fence can't be cut."))
to_chat(user, span_warning("This section of the fence can't be cut."))
return
if(invulnerable)
to_chat(user, span("warning", "This fence is too strong to cut through."))
to_chat(user, span_warning("This fence is too strong to cut through."))
return
var/current_stage = hole_size
if(current_stage >= MAX_HOLE_SIZE)
to_chat(user, span("notice", "This fence has too much cut out of it already."))
to_chat(user, span_notice("This fence has too much cut out of it already."))
return
user.visible_message(span("danger", "\The [user] starts cutting through \the [src] with \the [W]."),\
span("danger", "You start cutting through \the [src] with \the [W]."))
user.visible_message(span_danger("\The [user] starts cutting through \the [src] with \the [W]."),\
span_danger("You start cutting through \the [src] with \the [W]."))
playsound(src, W.usesound, 50, 1)
if(do_after(user, CUT_TIME * W.toolspeed, target = src))
if(current_stage == hole_size)
switch(++hole_size)
if(MEDIUM_HOLE)
visible_message(span("notice", "\The [user] cuts into \the [src] some more."))
to_chat(user, span("notice", "You could probably fit yourself through that hole now. Although climbing through would be much faster if you made it even bigger."))
visible_message(span_notice("\The [user] cuts into \the [src] some more."))
to_chat(user, span_notice("You could probably fit yourself through that hole now. Although climbing through would be much faster if you made it even bigger."))
climbable = TRUE
if(LARGE_HOLE)
visible_message(span("notice", "\The [user] completely cuts through \the [src]."))
to_chat(user, span("notice", "The hole in \the [src] is now big enough to walk through."))
visible_message(span_notice("\The [user] completely cuts through \the [src]."))
to_chat(user, span_notice("The hole in \the [src] is now big enough to walk through."))
climbable = FALSE
update_cut_status()
return TRUE
@@ -140,17 +140,17 @@
if(can_open(user))
toggle(user)
else
to_chat(user, span("warning", "\The [src] is [!open ? "locked" : "stuck open"]."))
to_chat(user, span_warning("\The [src] is [!open ? "locked" : "stuck open"]."))
return TRUE
/obj/structure/fence/door/proc/toggle(mob/user)
switch(open)
if(FALSE)
visible_message(span("notice", "\The [user] opens \the [src]."))
visible_message(span_notice("\The [user] opens \the [src]."))
open = TRUE
if(TRUE)
visible_message(span("notice", "\The [user] closes \the [src]."))
visible_message(span_notice("\The [user] closes \the [src]."))
open = FALSE
update_door_status()
@@ -211,4 +211,4 @@
#undef NO_HOLE
#undef MEDIUM_HOLE
#undef LARGE_HOLE
#undef MAX_HOLE_SIZE
#undef MAX_HOLE_SIZE
code/game/objects/structures/flora/flora.dm
+6 -6
View File
@@ -43,11 +43,11 @@
. += get_harvestable_desc()
if(harvest_tool)
var/obj/item/tool = harvest_tool
. += SPAN_NOTICE("\The [src] can be harvested with \a [initial(tool.name)].")
. += span_notice("\The [src] can be harvested with \a [initial(tool.name)].")
if(removal_tool)
var/obj/item/tool = removal_tool
. += SPAN_NOTICE("\The [src] can be removed with \a [initial(tool.name)].")
. += span_notice("\The [src] can be removed with \a [initial(tool.name)].")
/obj/structure/flora/proc/get_harvestable_desc()
return "<span class='notice'>\The [src] seems to have something hanging from it.</span>"
@@ -58,15 +58,15 @@
var/harvest_spawn = pickweight(harvest_loot)
var/atom/movable/AM = spawn_harvest(harvest_spawn, user)
if(AM)
to_chat(user, SPAN_NOTICE("You harvest \the [AM] from \the [src]."))
to_chat(user, span_notice("You harvest \the [AM] from \the [src]."))
else
to_chat(user, SPAN_NOTICE("You fail to harvest anything from \the [src]."))
to_chat(user, span_notice("You fail to harvest anything from \the [src]."))
return
if(removal_tool && istype(W, removal_tool))
to_chat(user, SPAN_WARNING("You start uprooting \the [src]..."))
to_chat(user, span_warning("You start uprooting \the [src]..."))
if(do_after(user, 30))
visible_message(SPAN_NOTICE("\The [user] uproots and discards \the [src]!"))
visible_message(span_notice("\The [user] uproots and discards \the [src]!"))
qdel(src)
return
code/game/objects/structures/flora/trees.dm
+2 -3
View File
@@ -177,9 +177,9 @@
return
if(ckeys_that_took[user.ckey])
to_chat(user, span("warning", "There are no presents with your name on."))
to_chat(user, span_warning("There are no presents with your name on."))
return
to_chat(user, span("notice", "After a bit of rummaging, you locate a gift with your name on it!"))
to_chat(user, span_notice("After a bit of rummaging, you locate a gift with your name on it!"))
ckeys_that_took[user.ckey] = TRUE
var/obj/item/G = new gift_type(src)
user.put_in_hands(G)
@@ -295,4 +295,3 @@
set_light(bulbs, 1, "#33ccff") // 5 variants, missing bulbs. 5th has no bulbs, so no glow.
add_overlay(mutable_appearance(icon, "[base_state][bulbs]_glow"))
add_overlay(emissive_appearance(icon, "[base_state][bulbs]_glow"))
code/game/objects/structures/ghost_pods/survivor.dm
+2 -2
View File
@@ -44,9 +44,9 @@
/obj/structure/ghost_pod/manual/survivor/trigger()
. = ..()
desc += "\n The Pod's stasis is broken!"
visible_message(message = SPAN_WARNING("\The [src] hisses and blinks in a myriad of lights as its stasis ceases! \n \
visible_message(message = span_warning("\The [src] hisses and blinks in a myriad of lights as its stasis ceases! \n \
What or whoever lays beneath may yet stir once more, but their wounds may be too grevious... "),
blind_message = SPAN_WARNING("You hear hissing from [src]!"),
blind_message = span_warning("You hear hissing from [src]!"),
runemessage = "HISS")
code/game/objects/structures/girders.dm
+2 -2
View File
@@ -397,7 +397,7 @@
switch(passed_mode)
if(RCD_FLOORWALL)
to_chat(user, span("notice", "You finish a wall."))
to_chat(user, span_notice("You finish a wall."))
// This is mostly the same as using on a floor. The girder's material is preserved, however.
T.ChangeTurf(wall_type)
var/turf/simulated/wall/new_T = get_turf(src) // Ref to the wall we just built.
@@ -410,7 +410,7 @@
return TRUE
if(RCD_DECONSTRUCT)
to_chat(user, span("notice", "You deconstruct \the [src]."))
to_chat(user, span_notice("You deconstruct \the [src]."))
qdel(src)
return TRUE
code/game/objects/structures/grille.dm
+2 -3
View File
@@ -270,13 +270,13 @@
/obj/structure/grille/rcd_act(mob/living/user, obj/item/rcd/the_rcd, passed_mode)
switch(passed_mode)
if(RCD_DECONSTRUCT)
to_chat(user, span("notice", "You deconstruct \the [src]."))
to_chat(user, span_notice("You deconstruct \the [src]."))
qdel(src)
return TRUE
if(RCD_WINDOWGRILLE)
if(locate(/obj/structure/window) in loc)
return FALSE
to_chat(user, span("notice", "You construct a window."))
to_chat(user, span_notice("You construct a window."))
var/obj/structure/window/WD = new the_rcd.window_type(loc)
WD.anchored = TRUE
return TRUE
@@ -286,4 +286,3 @@
health -= damage
spawn(1) healthcheck()
return 1
code/game/objects/structures/low_wall.dm
+1 -1
View File
@@ -158,7 +158,7 @@
O.forceMove(loc)
auto_align(I, params, TRUE)
else
to_chat(user, SPAN_WARNING("\The [I] is too big for you to move!"))
to_chat(user, span_warning("\The [I] is too big for you to move!"))
return
/obj/structure/low_wall/proc/handle_rod_use(mob/user, obj/item/stack/rods/R)
code/game/objects/structures/props/fake_ai.dm
+2 -2
View File
@@ -8,7 +8,7 @@
/obj/structure/prop/fake_ai/attackby(obj/O, mob/user)
if(istype(O, /obj/item/aicard)) // People trying to card the fake AI will get told its impossible.
to_chat(user, span("warning", "This core does not appear to have a suitable port to use \the [O] on..."))
to_chat(user, span_warning("This core does not appear to have a suitable port to use \the [O] on..."))
return TRUE
return ..()
@@ -17,4 +17,4 @@
/obj/structure/prop/fake_ai/dead/crashed_med_shuttle
name = "V.I.T.A."
icon_state = "ai-heartline-crash"
icon_state = "ai-heartline-crash"
code/game/objects/structures/signs.dm
+8 -8
View File
@@ -17,7 +17,7 @@
else ..()
/obj/structure/sign/proc/unfasten(mob/user)
user.visible_message(SPAN_NOTICE("\The [user] unfastens \the [src]."), SPAN_NOTICE("You unfasten \the [src]."))
user.visible_message(span_notice("\The [user] unfastens \the [src]."), span_notice("You unfasten \the [src]."))
var/obj/item/sign/S = new(src.loc)
S.name = name
S.desc = desc
@@ -1539,12 +1539,12 @@
return
if((!iswall(A) && !istype(A, /obj/structure/window)) || !isturf(user.loc))
to_chat(user, SPAN_WARNING("You can't place this here!"))
to_chat(user, span_warning("You can't place this here!"))
return
var/placement_dir = get_dir(user, A)
if (!(placement_dir in cardinal))
to_chat(user, SPAN_WARNING("You must stand directly in front of the location you wish to place that on."))
to_chat(user, span_warning("You must stand directly in front of the location you wish to place that on."))
return
var/obj/structure/sign/flag/P = new(user.loc)
@@ -1613,11 +1613,11 @@
/obj/structure/sign/flag/unfasten(mob/user)
if(!ripped)
user.visible_message(SPAN_NOTICE("\The [user] unfastens \the [src] and folds it back up."), SPAN_NOTICE("You unfasten \the [src] and fold it back up."))
user.visible_message(span_notice("\The [user] unfastens \the [src] and folds it back up."), span_notice("You unfasten \the [src] and fold it back up."))
var/obj/item/flag/F = new flagtype(get_turf(user))
user.put_in_hands(F)
else
user.visible_message(SPAN_NOTICE("\The [user] unfastens the tattered remnants of \the [src]."), SPAN_NOTICE("You unfasten the tattered remains of \the [src]."))
user.visible_message(span_notice("\The [user] unfastens the tattered remnants of \the [src]."), span_notice("You unfasten the tattered remains of \the [src]."))
if(linked_flag)
qdel(linked_flag) //otherwise you're going to get weird duping nonsense
qdel(src)
@@ -1626,7 +1626,7 @@
if(alert("Do you want to rip \the [src] from its place?","You think...","Yes","No") == "Yes")
if(!Adjacent(user)) //Cannot bring up dialogue and walk away
return FALSE
visible_message(SPAN_WARNING("\The [user] rips \the [src] in a single, decisive motion!" ))
visible_message(span_warning("\The [user] rips \the [src] in a single, decisive motion!" ))
playsound(src.loc, 'sound/items/poster_ripped.ogg', 100, 1)
add_fingerprint(user)
rip()
@@ -1645,10 +1645,10 @@
/obj/structure/sign/flag/attackby(obj/item/W, mob/user)
..()
if(istype(W, /obj/item/flame/lighter) || istype(W, /obj/item/weldingtool))
visible_message(SPAN_WARNING("\The [user] starts to burn \the [src] down!"))
visible_message(span_warning("\The [user] starts to burn \the [src] down!"))
if(!do_after(user, 2 SECONDS))
return FALSE
visible_message(SPAN_WARNING("\The [user] burns \the [src] down!"))
visible_message(span_warning("\The [user] burns \the [src] down!"))
playsound(src.loc, 'sound/items/cigs_lighters/cig_light.ogg', 100, 1)
new /obj/effect/decal/cleanable/ash(src.loc)
if(linked_flag)
code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
+2 -2
View File
@@ -35,10 +35,10 @@
. = ..()
if(.)
if(M.mob_size < min_mob_buckle_size)
to_chat(M, SPAN_WARNING("You are too small to use \the [src]."))
to_chat(M, span_warning("You are too small to use \the [src]."))
. = FALSE
else if(M.mob_size >= max_mob_buckle_size)
to_chat(M, SPAN_WARNING("You are too large to use \the [src]."))
to_chat(M, span_warning("You are too large to use \the [src]."))
. = FALSE
/obj/structure/bed/chair/wheelchair/update_icon()
code/game/objects/structures/window.dm
+1 -1
View File
@@ -698,7 +698,7 @@
/obj/structure/window/rcd_act(mob/living/user, obj/item/rcd/the_rcd, passed_mode)
switch(passed_mode)
if(RCD_DECONSTRUCT)
to_chat(user, span("notice", "You deconstruct \the [src]."))
to_chat(user, span_notice("You deconstruct \the [src]."))
qdel(src)
return TRUE
return FALSE