cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

The Great Spanning (#9320)

Browse Source 
This PR get rid of all (most of) the span("thing", spans and replaces them with the SPAN_THING( variant, which has gained more popularity recently.
This commit is contained in:
Geeves
2020-07-12 15:53:28 +03:00
committed by GitHub
parent 29cfd74770
commit 33ad8096fb
260 changed files with 1527 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/crates.dm
+6 -6
View File
@@ -51,9 +51,9 @@
for (var/mob/M in src)
M.forceMove(get_turf(src))
if (M.stat == CONSCIOUS)
M.visible_message(span("danger","\The [M.name] bursts out of the [src]!"), span("danger","You burst out of the [src]!"))
M.visible_message(SPAN_DANGER("\The [M.name] bursts out of the [src]!"), SPAN_DANGER("You burst out of the [src]!"))
else
M.visible_message(span("danger","\The [M.name] tumbles out of the [src]!"))
M.visible_message(SPAN_DANGER("\The [M.name] tumbles out of the [src]!"))
icon_state = icon_opened
opened = 1
@@ -172,7 +172,7 @@
/obj/structure/closet/crate/toggle(var/mob/user)
if (!opened && tablestatus == -1)
to_chat(user, span("warning", "You can't open that while it's under the table"))
to_chat(user, SPAN_WARNING("You can't open that while it's under the table"))
return 0
else
return ..()
@@ -210,18 +210,18 @@
//User must be in reach of the crate
if (!user.Adjacent(src))
to_chat(user, span("warning", "You need to be closer to the crate!"))
to_chat(user, SPAN_WARNING("You need to be closer to the crate!"))
return
//One of us has to be near the table
if (!user.Adjacent(table) && !Adjacent(table))
to_chat(user, span("warning", "Take the crate closer to the table!"))
to_chat(user, SPAN_WARNING("Take the crate closer to the table!"))
return
for (var/obj/structure/closet/crate/C in get_turf(table))
if (C.tablestatus != -1)
to_chat(user, span("warning", "There's already a crate on this table!"))
to_chat(user, SPAN_WARNING("There's already a crate on this table!"))
return
//Crates are heavy, hauling them onto tables is hard.
code/game/objects/structures/curtains.dm
+5 -5
View File
@@ -37,14 +37,14 @@
if(W.iswirecutter() || W.sharp && !W.noslice)
if(manipulating) return
manipulating = TRUE
visible_message(span("notice", "[user] begins cutting down \the [src]."),
span("notice", "You begin cutting down \the [src]."))
visible_message(SPAN_NOTICE("[user] begins cutting down \the [src]."),
SPAN_NOTICE("You begin cutting down \the [src]."))
if(!do_after(user, 30/W.toolspeed))
manipulating = FALSE
return
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
visible_message(span("notice", "[user] cuts down \the [src]."),
span("notice", "You cut down \the [src]."))
visible_message(SPAN_NOTICE("[user] cuts down \the [src]."),
SPAN_NOTICE("You cut down \the [src]."))
if(istype(src, /obj/structure/curtain/open/medical))
new /obj/item/stack/material/plastic(src.loc)
else
@@ -59,7 +59,7 @@
to_chat(user, "There is already a curtain secured here!")
return
playsound(src.loc, W.usesound, 50, 1)
visible_message(span("notice", "\The [src] has been [anchored ? "secured in place" : "unsecured"] by \the [user]."))
visible_message(SPAN_NOTICE("\The [src] has been [anchored ? "secured in place" : "unsecured"] by \the [user]."))
/obj/structure/curtain/proc/toggle()
src.set_opacity(!src.opacity)
code/game/objects/structures/lattice.dm
+1 -1
View File
@@ -144,7 +144,7 @@
if(C.iswelder() && damaged)
var/obj/item/weldingtool/WT = C
if(do_after(user, 5/C.toolspeed, act_target = src) && WT.remove_fuel(1, user))
to_chat(user, span("notice","You slice apart the [src] leaving nothing useful behind."))
to_chat(user, SPAN_NOTICE("You slice apart the [src] leaving nothing useful behind."))
playsound(src, 'sound/items/Welder.ogg', 50, 1)
qdel(src)
else
code/game/objects/structures/musician.dm
+1 -1
View File
@@ -256,7 +256,7 @@
return
if(broken)
to_chat(user,span("notice","\The [src] seems to be broken after so many years of misuse, perhaps due to reckless hooligans breaking into the display case and carelessly bashing keys."))
to_chat(user, SPAN_NOTICE("\The [src] seems to be broken after so many years of misuse, perhaps due to reckless hooligans breaking into the display case and carelessly bashing keys."))
return
usr.machine = src
code/game/objects/structures/plasticflaps.dm
+4 -4
View File
@@ -51,14 +51,14 @@
if(manipulating) return
manipulating = TRUE
if(W.iswirecutter() || W.sharp && !W.noslice)
visible_message(span("notice", "[user] begins cutting down \the [src]."),
span("notice", "You begin cutting down \the [src]."))
visible_message(SPAN_NOTICE("[user] begins cutting down \the [src]."),
SPAN_NOTICE("You begin cutting down \the [src]."))
if(!do_after(user, 30/W.toolspeed))
manipulating = FALSE
return
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
visible_message(span("notice", "[user] cuts down \the [src]."),
span("notice", "You cut down \the [src]."))
visible_message(SPAN_NOTICE("[user] cuts down \the [src]."),
SPAN_NOTICE("You cut down \the [src]."))
qdel(src)
/obj/structure/plasticflaps/mining //A specific type for mining that doesn't allow airflow because of them damn crates
code/game/objects/structures/signs.dm
+5 -5
View File
@@ -639,12 +639,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)
@@ -694,7 +694,7 @@
if(!do_after(user, 2 SECONDS, act_target = src))
return 0
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)
icon_state = "poster_ripped"
name = "ripped poster"
@@ -706,11 +706,11 @@
if(istype(W, /obj/item/flame/lighter))
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, act_target = src))
return 0
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/zippo_on.ogg', 100, 1)
new /obj/effect/decal/cleanable/ash(src.loc)
code/game/objects/structures/therapy.dm
+2 -2
View File
@@ -116,9 +116,9 @@
set src in usr
if(closed)
usr.visible_message (span("notice", "[usr] taps their foot on the floor, arrogantly pointing at the [src] in their hand with a look of derision in their eyes, not noticing it's closed."), span("notice", "You point down at the [src], an arrogant look about your eyes."))
usr.visible_message (SPAN_NOTICE("[usr] taps their foot on the floor, arrogantly pointing at the [src] in their hand with a look of derision in their eyes, not noticing it's closed."), SPAN_NOTICE("You point down at the [src], an arrogant look about your eyes."))
else
usr.visible_message (span("notice", "[usr] taps their foot on the floor, arrogantly pointing at the [src] in their hand with a look of derision in their eyes."), span("notice", "You point down at the [src], an arrogant look about your eyes."))
usr.visible_message (SPAN_NOTICE("[usr] taps their foot on the floor, arrogantly pointing at the [src] in their hand with a look of derision in their eyes."), SPAN_NOTICE("You point down at the [src], an arrogant look about your eyes."))
/obj/item/mesmetron
name = "mesmetron pocketwatch"
code/game/objects/structures/vr/_remote_chair.dm
+1 -1
View File
@@ -35,7 +35,7 @@
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.old_mob)
to_chat(H, span("warning", "The chair rejects you! You cannot recursively control bodies."))
to_chat(H, SPAN_WARNING("The chair rejects you! You cannot recursively control bodies."))
return
add_overlay(image('icons/obj/furniture.dmi', src, "vr_helmet", MOB_LAYER + 1))
code/game/objects/structures/watercloset.dm
+40 -40
View File
@@ -20,13 +20,13 @@
/obj/structure/toilet/attack_hand(mob/living/user as mob)
if(swirlie)
usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
usr.visible_message(span("danger", "[user] slams the toilet seat onto [swirlie.name]'s head!"), span("notice", "You slam the toilet seat onto [swirlie.name]'s head!"), "You hear reverberating porcelain.")
usr.visible_message(SPAN_DANGER("[user] slams the toilet seat onto [swirlie.name]'s head!"), SPAN_NOTICE("You slam the toilet seat onto [swirlie.name]'s head!"), "You hear reverberating porcelain.")
swirlie.adjustBruteLoss(8)
return
if(cistern && !open)
if(!contents.len)
to_chat(user, span("notice", "The cistern is empty."))
to_chat(user, SPAN_NOTICE("The cistern is empty."))
return
else
var/obj/item/I = pick(contents)
@@ -34,7 +34,7 @@
user.put_in_hands(I)
else
I.forceMove(get_turf(src))
to_chat(user, span("notice", "You find \an [I] in the cistern."))
to_chat(user, SPAN_NOTICE("You find \an [I] in the cistern."))
w_items -= I.w_class
return
@@ -46,10 +46,10 @@
/obj/structure/toilet/attackby(obj/item/I as obj, mob/living/user as mob)
if(I.iscrowbar())
to_chat(user, span("notice", "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]."))
to_chat(user, SPAN_NOTICE("You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]."))
playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1)
if(do_after(user, 30/I.toolspeed))
user.visible_message(span("notice", "[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!"), span("notice", "You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!"), "You hear grinding porcelain.")
user.visible_message(SPAN_NOTICE("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!"), SPAN_NOTICE("You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!"), "You hear grinding porcelain.")
cistern = !cistern
update_icon()
return
@@ -63,29 +63,29 @@
if(G.state>1)
if(!GM.loc == get_turf(src))
to_chat(user, span("notice", "[GM.name] needs to be on the toilet."))
to_chat(user, SPAN_NOTICE("[GM.name] needs to be on the toilet."))
return
if(open && !swirlie)
user.visible_message(span("danger", "[user] starts to give [GM.name] a swirlie!"), span("notice", "You start to give [GM.name] a swirlie!"))
user.visible_message(SPAN_DANGER("[user] starts to give [GM.name] a swirlie!"), SPAN_NOTICE("You start to give [GM.name] a swirlie!"))
swirlie = GM
if(do_after(user, 30, 5, 0))
user.visible_message(span("danger", "[user] gives [GM.name] a swirlie!"), span("notice", "You give [GM.name] a swirlie!"), "You hear a toilet flushing.")
user.visible_message(SPAN_DANGER("[user] gives [GM.name] a swirlie!"), SPAN_NOTICE("You give [GM.name] a swirlie!"), "You hear a toilet flushing.")
if(!GM.internal)
GM.adjustOxyLoss(5)
SSfeedback.IncrementSimpleStat("swirlies")
swirlie = null
else
user.visible_message(span("danger", "[user] slams [GM.name] into the [src]!"), span("notice", "You slam [GM.name] into the [src]!"))
user.visible_message(SPAN_DANGER("[user] slams [GM.name] into the [src]!"), SPAN_NOTICE("You slam [GM.name] into the [src]!"))
GM.adjustBruteLoss(8)
else
to_chat(user, span("notice", "You need a tighter grip."))
to_chat(user, SPAN_NOTICE("You need a tighter grip."))
if(cistern && !istype(user,/mob/living/silicon/robot)) //STOP PUTTING YOUR MODULES IN THE TOILET.
if(I.w_class > 3)
to_chat(user, span("notice", "\The [I] does not fit."))
to_chat(user, SPAN_NOTICE("\The [I] does not fit."))
return
if(w_items + I.w_class > 5)
to_chat(user, span("notice", "The cistern is full."))
to_chat(user, SPAN_NOTICE("The cistern is full."))
return
user.drop_from_inventory(I,src)
w_items += I.w_class
@@ -116,12 +116,12 @@
var/mob/living/GM = G.affecting
if(G.state>1)
if(!GM.loc == get_turf(src))
to_chat(user, span("notice", "[GM.name] needs to be on the urinal."))
to_chat(user, SPAN_NOTICE("[GM.name] needs to be on the urinal."))
return
user.visible_message(span("danger", "[user] slams [GM.name] into the [src]!"), span("notice", "You slam [GM.name] into the [src]!"))
user.visible_message(SPAN_DANGER("[user] slams [GM.name] into the [src]!"), SPAN_NOTICE("You slam [GM.name] into the [src]!"))
GM.adjustBruteLoss(8)
else
to_chat(user, span("notice", "You need a tighter grip."))
to_chat(user, SPAN_NOTICE("You need a tighter grip."))
@@ -174,14 +174,14 @@
/obj/machinery/shower/attackby(obj/item/I as obj, mob/user as mob)
if(I.type == /obj/item/device/analyzer)
to_chat(user, span("notice", "The water temperature seems to be [watertemp]."))
to_chat(user, SPAN_NOTICE("The water temperature seems to be [watertemp]."))
if(I.iswrench())
var/newtemp = input(user, "What setting would you like to set the temperature valve to?", "Water Temperature Valve") in temperature_settings
to_chat(user, span("notice", "You begin to adjust the temperature valve with \the [I]."))
to_chat(user, SPAN_NOTICE("You begin to adjust the temperature valve with \the [I]."))
playsound(src.loc, I.usesound, 50, 1)
if(do_after(user, 50/I.toolspeed))
watertemp = newtemp
user.visible_message(span("notice", "[user] adjusts the shower with \the [I]."), span("notice", "You adjust the shower with \the [I]."))
user.visible_message(SPAN_NOTICE("[user] adjusts the shower with \the [I]."), SPAN_NOTICE("You adjust the shower with \the [I]."))
add_fingerprint(user)
/obj/machinery/shower/update_icon() //this is terribly unreadable, but basically it makes the shower mist up
@@ -378,9 +378,9 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(temperature >= H.species.heat_level_1)
to_chat(H, span("danger", "The water is searing hot!"))
to_chat(H, SPAN_DANGER("The water is searing hot!"))
else if(temperature <= H.species.cold_level_1)
to_chat(H, span("warning", "The water is freezing cold!"))
to_chat(H, SPAN_WARNING("The water is freezing cold!"))
/obj/item/bikehorn/rubberducky
name = "rubber ducky"
@@ -414,7 +414,7 @@
if (user.hand)
temp = H.organs_by_name[BP_L_HAND]
if(temp && !temp.is_usable())
to_chat(user, span("notice", "You try to move your [temp.name], but cannot!"))
to_chat(user, SPAN_NOTICE("You try to move your [temp.name], but cannot!"))
return
if(isrobot(user) || isAI(user))
@@ -424,10 +424,10 @@
return
if(busy)
to_chat(user, span("warning", "Someone's already washing here."))
to_chat(user, SPAN_WARNING("Someone's already washing here."))
return
to_chat(usr, span("notice", "You start washing your hands."))
to_chat(usr, SPAN_NOTICE("You start washing your hands."))
playsound(loc, 'sound/effects/sink_long.ogg', 75, 1)
busy = 1
@@ -441,12 +441,12 @@
user.clean_blood()
user.visible_message( \
span("notice", "[user] washes their hands using \the [src]."), \
span("notice", "You wash your hands using \the [src]."))
SPAN_NOTICE("[user] washes their hands using \the [src]."), \
SPAN_NOTICE("You wash your hands using \the [src]."))
/obj/structure/sink/attackby(obj/item/O as obj, mob/user as mob)
if(busy)
to_chat(user, span("warning", "Someone's already washing here."))
to_chat(user, SPAN_WARNING("Someone's already washing here."))
return
// Filling/emptying open reagent containers
@@ -457,13 +457,13 @@
if(!usr.Adjacent(src)) return
if(RG.loc != usr && !isrobot(user)) return
if(busy)
to_chat(usr, span("warning", "Someone's already using \the [src]."))
to_chat(usr, SPAN_WARNING("Someone's already using \the [src]."))
return
switch(atype)
if ("Fill")
if(RG.reagents.total_volume >= RG.volume)
to_chat(usr, span("warning", "\The [RG] is already full."))
to_chat(usr, SPAN_WARNING("\The [RG] is already full."))
return
RG.reagents.add_reagent(/datum/reagent/water, min(RG.volume - RG.reagents.total_volume, amount_per_transfer_from_this))
@@ -472,7 +472,7 @@
playsound(loc, 'sound/effects/sink.ogg', 75, 1)
if ("Empty")
if(!RG.reagents.total_volume)
to_chat(usr, span("warning", "\The [RG] is already empty."))
to_chat(usr, SPAN_WARNING("\The [RG] is already empty."))
return
var/empty_amount = RG.reagents.trans_to(src, RG.amount_per_transfer_from_this)
@@ -487,22 +487,22 @@
switch(S.mode)
if(0) // draw
if(S.reagents.total_volume >= S.volume)
to_chat(usr, span("warning", "\The [S] is already full."))
to_chat(usr, SPAN_WARNING("\The [S] is already full."))
return
var/trans = min(S.volume - S.reagents.total_volume, S.amount_per_transfer_from_this)
S.reagents.add_reagent(/datum/reagent/water, trans)
user.visible_message(span("notice", "[usr] uses \the [S] to draw water from \the [src]."),
span("notice", "You draw [trans] units of water from \the [src]. \The [S] now contains [S.reagents.total_volume] units."))
user.visible_message(SPAN_NOTICE("[usr] uses \the [S] to draw water from \the [src]."),
SPAN_NOTICE("You draw [trans] units of water from \the [src]. \The [S] now contains [S.reagents.total_volume] units."))
if(1) // inject
if(!S.reagents.total_volume)
to_chat(usr, span("warning", "\The [S] is already empty."))
to_chat(usr, SPAN_WARNING("\The [S] is already empty."))
return
var/trans = min(S.amount_per_transfer_from_this, S.reagents.total_volume)
S.reagents.remove_any(trans)
user.visible_message(span("notice", "[usr] empties \the [S] into \the [src]."),
span("notice", "You empty [trans] units of water into \the [src]. \The [S] now contains [S.reagents.total_volume] units."))
user.visible_message(SPAN_NOTICE("[usr] empties \the [S] into \the [src]."),
SPAN_NOTICE("You empty [trans] units of water into \the [src]. \The [S] now contains [S.reagents.total_volume] units."))
return
else if (istype(O, /obj/item/melee/baton))
@@ -518,14 +518,14 @@
R.cell.charge -= 20
else
B.deductcharge(B.hitcost)
user.visible_message(span("danger", "[user] was stunned by \the [O]!"))
user.visible_message(SPAN_DANGER("[user] was stunned by \the [O]!"))
return 1
// Short of a rewrite, this is necessary to stop monkeycubes being washed.
else if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
return
else if(istype(O, /obj/item/mop))
O.reagents.add_reagent(/datum/reagent/water, 5)
to_chat(user, span("notice", "You wet \the [O] in \the [src]."))
to_chat(user, SPAN_NOTICE("You wet \the [O] in \the [src]."))
playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
return
@@ -535,7 +535,7 @@
var/obj/item/I = O
if(!I || !istype(I,/obj/item)) return
to_chat(usr, span("notice", "You start washing \the [I]."))
to_chat(usr, SPAN_NOTICE("You start washing \the [I]."))
playsound(loc, 'sound/effects/sink_long.ogg', 75, 1)
busy = 1
@@ -550,8 +550,8 @@
O.clean_blood()
user.visible_message( \
span("notice", "[user] washes \a [I] using \the [src]."), \
span("notice", "You wash \a [I] using \the [src]."))
SPAN_NOTICE("[user] washes \a [I] using \the [src]."), \
SPAN_NOTICE("You wash \a [I] using \the [src]."))
/obj/structure/sink/kitchen
name = "kitchen sink"
code/game/objects/structures/window.dm
+28 -28
View File
@@ -26,24 +26,24 @@
. = ..(user)
if(health == maxhealth)
to_chat(user, span("notice", "It looks fully intact."))
to_chat(user, SPAN_NOTICE("It looks fully intact."))
else
var/perc = health / maxhealth
if(perc > 0.75)
to_chat(user, span("notice", "It has a few cracks."))
to_chat(user, SPAN_NOTICE("It has a few cracks."))
else if(perc > 0.5)
to_chat(user, span("warning", "It looks slightly damaged."))
to_chat(user, SPAN_WARNING("It looks slightly damaged."))
else if(perc > 0.25)
to_chat(user, span("warning", "It looks moderately damaged."))
to_chat(user, SPAN_WARNING("It looks moderately damaged."))
else
to_chat(user, span("danger", "It looks heavily damaged."))
to_chat(user, SPAN_DANGER("It looks heavily damaged."))
if(silicate)
if (silicate < 30)
to_chat(user, span("notice", "It has a thin layer of silicate."))
to_chat(user, SPAN_NOTICE("It has a thin layer of silicate."))
else if (silicate < 70)
to_chat(user, span("notice", "It is covered in silicate."))
to_chat(user, SPAN_NOTICE("It is covered in silicate."))
else
to_chat(user, span("notice", "There is a thick layer of silicate covering it."))
to_chat(user, SPAN_NOTICE("There is a thick layer of silicate covering it."))
/obj/structure/window/proc/take_damage(var/damage = 0, var/sound_effect = 1)
var/initialhealth = health
@@ -59,13 +59,13 @@
if(sound_effect)
playsound(loc, 'sound/effects/glass_hit.ogg', 100, 1)
if(health < maxhealth / 4 && initialhealth >= maxhealth / 4)
visible_message(span("danger", "[src] looks like it's about to shatter!"))
visible_message(SPAN_DANGER("[src] looks like it's about to shatter!"))
playsound(loc, "glasscrack", 100, 1)
else if(health < maxhealth / 2 && initialhealth >= maxhealth / 2)
visible_message(span("warning", "[src] looks seriously damaged!"))
visible_message(SPAN_WARNING("[src] looks seriously damaged!"))
playsound(loc, "glasscrack", 100, 1)
else if(health < maxhealth * 3/4 && initialhealth >= maxhealth * 3/4)
visible_message(span("warning", "Cracks begin to appear in [src]!"))
visible_message(SPAN_WARNING("Cracks begin to appear in [src]!"))
playsound(loc, "glasscrack", 100, 1)
return
@@ -89,7 +89,7 @@
/obj/structure/window/proc/shatter(var/display_message = 1)
playsound(src, "shatter", 70, 1)
if(display_message)
visible_message(span("warning", "\The [src] shatters!"))
visible_message(SPAN_WARNING("\The [src] shatters!"))
if(dir == SOUTHWEST)
var/index = null
index = 0
@@ -157,7 +157,7 @@
/obj/structure/window/hitby(AM as mob|obj)
..()
visible_message(span("danger", "[src] was hit by [AM]."))
visible_message(SPAN_DANGER("[src] was hit by [AM]."))
var/tforce = 0
if(ismob(AM))
tforce = 40
@@ -175,7 +175,7 @@
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(HULK in user.mutations)
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
user.visible_message(span("danger", "[user] smashes through [src]!"))
user.visible_message(SPAN_DANGER("[user] smashes through [src]!"))
user.do_attack_animation(src)
shatter()
@@ -188,8 +188,8 @@
playsound(src.loc, 'sound/effects/glass_knock.ogg', 90, 1)
user.do_attack_animation(src)
user.visible_message(span("danger", "\The [user] bangs against \the [src]!"),
span("danger", "You bang against \the [src]!"),
user.visible_message(SPAN_DANGER("\The [user] bangs against \the [src]!"),
SPAN_DANGER("You bang against \the [src]!"),
"You hear a banging sound.")
else
playsound(src.loc, 'sound/effects/glass_knock.ogg', 60, 1)
@@ -201,16 +201,16 @@
/obj/structure/window/attack_generic(var/mob/user, var/damage)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(damage >= 10)
visible_message(span("danger", "[user] smashes into [src]!"))
visible_message(SPAN_DANGER("[user] smashes into [src]!"))
take_damage(damage)
else
visible_message(span("notice", "\The [user] bonks \the [src] harmlessly."))
visible_message(SPAN_NOTICE("\The [user] bonks \the [src] harmlessly."))
playsound(src.loc, 'sound/effects/glass_hit.ogg', 10, 1, -2)
user.do_attack_animation(src)
return 1
/obj/structure/window/do_simple_ranged_interaction(var/mob/user)
visible_message(span("notice", "Something knocks on \the [src]."))
visible_message(SPAN_NOTICE("Something knocks on \the [src]."))
playsound(loc, 'sound/effects/glass_hit.ogg', 50, 1)
return TRUE
@@ -230,26 +230,26 @@
state = 3 - state
update_nearby_icons()
playsound(loc, W.usesound, 75, 1)
to_chat(user, (state == 1 ? span("notice", "You have unfastened the window from the frame.") : span("notice", "You have fastened the window to the frame.")))
to_chat(user, (state == 1 ? SPAN_NOTICE("You have unfastened the window from the frame.") : SPAN_NOTICE("You have fastened the window to the frame.")))
else if(reinf && state == 0)
anchored = !anchored
update_nearby_icons()
playsound(loc, W.usesound, 75, 1)
to_chat(user, (anchored ? span("notice", "You have fastened the frame to the floor.") : span("notice", "You have unfastened the frame from the floor.")))
to_chat(user, (anchored ? SPAN_NOTICE("You have fastened the frame to the floor.") : SPAN_NOTICE("You have unfastened the frame from the floor.")))
else if(!reinf)
anchored = !anchored
update_nearby_icons()
playsound(loc, W.usesound, 75, 1)
to_chat(user, (anchored ? span("notice", "You have fastened the window to the floor.") : span("notice", "You have unfastened the window.")))
to_chat(user, (anchored ? SPAN_NOTICE("You have fastened the window to the floor.") : SPAN_NOTICE("You have unfastened the window.")))
else if(W.iscrowbar() && reinf && state <= 1)
state = 1 - state
playsound(loc, W.usesound, 75, 1)
to_chat(user, (state ? span("notice", "You have pried the window into the frame.") : span("notice", "You have pried the window out of the frame.")))
to_chat(user, (state ? SPAN_NOTICE("You have pried the window into the frame.") : SPAN_NOTICE("You have pried the window out of the frame.")))
else if(W.iswrench() && !anchored && (!state || !reinf))
if(!glasstype)
to_chat(user, span("notice", "You're not sure how to dismantle \the [src] properly."))
to_chat(user, SPAN_NOTICE("You're not sure how to dismantle \the [src] properly."))
else
visible_message(span("notice", "[user] dismantles \the [src]."))
visible_message(SPAN_NOTICE("[user] dismantles \the [src]."))
if(dir == SOUTHWEST)
var/obj/item/stack/material/mats = new glasstype(loc)
mats.amount = is_fulltile() ? 4 : 2
@@ -281,17 +281,17 @@
var/blocked = M.run_armor_check(def_zone, "melee")
switch (state)
if(1)
M.visible_message(span("warning", "[user] slams [M] against \the [src]!"))
M.visible_message(SPAN_WARNING("[user] slams [M] against \the [src]!"))
M.apply_damage(7, damtype, def_zone, blocked, src)
hit(10)
if(2)
M.visible_message(span("danger", "[user] bashes [M] against \the [src]!"))
M.visible_message(SPAN_DANGER("[user] bashes [M] against \the [src]!"))
if (prob(50))
M.Weaken(1)
M.apply_damage(10, damtype, def_zone, blocked, src)
hit(25)
if(3)
M.visible_message(span("danger", "<big>[user] crushes [M] against \the [src]!</big>"))
M.visible_message(SPAN_DANGER("<big>[user] crushes [M] against \the [src]!</big>"))
M.Weaken(5)
M.apply_damage(20, damtype, def_zone, blocked, src)
hit(50)