cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 00:29:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds notice-span to visible_messages with no spans (#46044)

Browse Source 
About The Pull Request

Adds 'notice' span class to all visible_messages which had no span class, making all those black messages blue.
Why It's Good For The Game

This should help differentiate action-messages from talking-messages in the chat. More actions will be blue, thus black talking-messages should pop out more.
This commit is contained in:
kingofkosmos
2019-08-26 20:50:00 +12:00
committed by oranges
parent e23c2c03c6
commit df1fecc58c
211 changed files with 990 additions and 1013 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/beds_chairs/alien_nest.dm
+4 -8
View File
@@ -25,13 +25,11 @@
return
if(M != user)
M.visible_message(\
"[user.name] pulls [M.name] free from the sticky nest!",\
M.visible_message("<span class='notice'>[user.name] pulls [M.name] free from the sticky nest!</span>",\
"<span class='notice'>[user.name] pulls you free from the gelatinous resin.</span>",\
"<span class='italics'>You hear squelching...</span>")
else
M.visible_message(\
"<span class='warning'>[M.name] struggles to break free from the gelatinous resin!</span>",\
M.visible_message("<span class='warning'>[M.name] struggles to break free from the gelatinous resin!</span>",\
"<span class='notice'>You struggle to break free from the gelatinous resin... (Stay still for two minutes.)</span>",\
"<span class='italics'>You hear squelching...</span>")
if(!do_after(M, 1200, target = src))
@@ -40,8 +38,7 @@
return
if(!M.buckled)
return
M.visible_message(\
"<span class='warning'>[M.name] breaks free from the gelatinous resin!</span>",\
M.visible_message("<span class='warning'>[M.name] breaks free from the gelatinous resin!</span>",\
"<span class='notice'>You break free from the gelatinous resin!</span>",\
"<span class='italics'>You hear squelching...</span>")
@@ -61,8 +58,7 @@
unbuckle_all_mobs()
if(buckle_mob(M))
M.visible_message(\
"[user.name] secretes a thick vile goo, securing [M.name] into [src]!",\
M.visible_message("<span class='notice'>[user.name] secretes a thick vile goo, securing [M.name] into [src]!</span>",\
"<span class='danger'>[user.name] drenches you in a foul-smelling resin, trapping you in [src]!</span>",\
"<span class='italics'>You hear squelching...</span>")
code/game/objects/structures/beds_chairs/bed.dm
+3 -3
View File
@@ -70,7 +70,7 @@
else
R.loaded = src
forceMove(R)
user.visible_message("[user] collects [src].", "<span class='notice'>You collect [src].</span>")
user.visible_message("<span class='notice'>[user] collects [src].</span>", "<span class='notice'>You collect [src].</span>")
return 1
else
return ..()
@@ -82,7 +82,7 @@
return 0
if(has_buckled_mobs())
return 0
usr.visible_message("[usr] collapses \the [src.name].", "<span class='notice'>You collapse \the [src.name].</span>")
usr.visible_message("<span class='notice'>[usr] collapses \the [src.name].</span>", "<span class='notice'>You collapse \the [src.name].</span>")
var/obj/structure/bed/roller/B = new foldabletype(get_turf(src))
usr.put_in_hands(B)
qdel(src)
@@ -154,7 +154,7 @@
/obj/item/roller/robo/deploy_roller(mob/user, atom/location)
if(loaded)
loaded.forceMove(location)
user.visible_message("[user] deploys [loaded].", "<span class='notice'>You deploy [loaded].</span>")
user.visible_message("<span class='notice'>[user] deploys [loaded].</span>", "<span class='notice'>You deploy [loaded].</span>")
loaded = null
else
to_chat(user, "<span class='warning'>The dock is empty!</span>")
code/game/objects/structures/crates_lockers/crates/large.dm
+2 -2
View File
@@ -24,7 +24,7 @@
if(manifest)
tear_manifest(user)
user.visible_message("[user] pries \the [src] open.", \
user.visible_message("<span class='notice'>[user] pries \the [src] open.</span>", \
"<span class='notice'>You pry open \the [src].</span>", \
"<span class='italics'>You hear splitting wood.</span>")
playsound(src.loc, 'sound/weapons/slashmiss.ogg', 75, 1)
@@ -44,4 +44,4 @@
else
to_chat(user, "<span class='warning'>You need a crowbar to pry this open!</span>")
return FALSE //Just stop. Do nothing. Don't turn into an invisible sprite. Don't open like a locker.
//The large crate has no non-attack interactions other than the crowbar, anyway.
//The large crate has no non-attack interactions other than the crowbar, anyway.
code/game/objects/structures/door_assembly.dm
+12 -12
View File
@@ -64,7 +64,7 @@
if(mineral)
var/obj/item/stack/sheet/mineral/mineral_path = text2path("/obj/item/stack/sheet/mineral/[mineral]")
user.visible_message("[user] welds the [mineral] plating off the airlock assembly.", "You start to weld the [mineral] plating off the airlock assembly...")
user.visible_message("<span class='notice'>[user] welds the [mineral] plating off the airlock assembly.</span>", "<span class='notice'>You start to weld the [mineral] plating off the airlock assembly...</span>")
if(W.use_tool(src, user, 40, volume=50))
to_chat(user, "<span class='notice'>You weld the [mineral] plating off.</span>")
new mineral_path(loc, 2)
@@ -72,7 +72,7 @@
transfer_assembly_vars(src, PA)
else if(glass)
user.visible_message("[user] welds the glass panel out of the airlock assembly.", "You start to weld the glass panel out of the airlock assembly...")
user.visible_message("<span class='notice'>[user] welds the glass panel out of the airlock assembly.</span>", "<span class='notice'>You start to weld the glass panel out of the airlock assembly...</span>")
if(W.use_tool(src, user, 40, volume=50))
to_chat(user, "<span class='notice'>You weld the glass panel out.</span>")
if(heat_proof_finished)
@@ -83,7 +83,7 @@
glass = 0
else if(!anchored)
user.visible_message("<span class='warning'>[user] disassembles the airlock assembly.</span>", \
"You start to disassemble the airlock assembly...")
"<span class='notice'>You start to disassemble the airlock assembly...</span>")
if(W.use_tool(src, user, 40, volume=50))
to_chat(user, "<span class='notice'>You disassemble the airlock assembly.</span>")
deconstruct(TRUE)
@@ -97,7 +97,7 @@
break
if(door_check)
user.visible_message("[user] secures the airlock assembly to the floor.", \
user.visible_message("<span class='notice'>[user] secures the airlock assembly to the floor.</span>", \
"<span class='notice'>You start to secure the airlock assembly to the floor...</span>", \
"<span class='italics'>You hear wrenching.</span>")
@@ -111,7 +111,7 @@
to_chat(user, "There is another door here!")
else
user.visible_message("[user] unsecures the airlock assembly from the floor.", \
user.visible_message("<span class='notice'>[user] unsecures the airlock assembly from the floor.</span>", \
"<span class='notice'>You start to unsecure the airlock assembly from the floor...</span>", \
"<span class='italics'>You hear wrenching.</span>")
if(W.use_tool(src, user, 40, volume=100))
@@ -125,7 +125,7 @@
if(!W.tool_start_check(user, amount=1))
return
user.visible_message("[user] wires the airlock assembly.", \
user.visible_message("<span class='notice'>[user] wires the airlock assembly.</span>", \
"<span class='notice'>You start to wire the airlock assembly...</span>")
if(W.use_tool(src, user, 40, amount=1))
if(state != AIRLOCK_ASSEMBLY_NEEDS_WIRES)
@@ -135,7 +135,7 @@
name = "wired airlock assembly"
else if((W.tool_behaviour == TOOL_WIRECUTTER) && state == AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS )
user.visible_message("[user] cuts the wires from the airlock assembly.", \
user.visible_message("<span class='notice'>[user] cuts the wires from the airlock assembly.</span>", \
"<span class='notice'>You start to cut the wires from the airlock assembly...</span>")
if(W.use_tool(src, user, 40, volume=100))
@@ -148,7 +148,7 @@
else if(istype(W, /obj/item/electronics/airlock) && state == AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS )
W.play_tool_sound(src, 100)
user.visible_message("[user] installs the electronics into the airlock assembly.", \
user.visible_message("<span class='notice'>[user] installs the electronics into the airlock assembly.</span>", \
"<span class='notice'>You start to install electronics into the airlock assembly...</span>")
if(do_after(user, 40, target = src))
if( state != AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS )
@@ -163,7 +163,7 @@
else if((W.tool_behaviour == TOOL_CROWBAR) && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER )
user.visible_message("[user] removes the electronics from the airlock assembly.", \
user.visible_message("<span class='notice'>[user] removes the electronics from the airlock assembly.</span>", \
"<span class='notice'>You start to remove electronics from the airlock assembly...</span>")
if(W.use_tool(src, user, 40, volume=100))
@@ -188,7 +188,7 @@
if(!glass)
if(istype(G, /obj/item/stack/sheet/rglass) || istype(G, /obj/item/stack/sheet/glass))
playsound(src, 'sound/items/crowbar.ogg', 100, 1)
user.visible_message("[user] adds [G.name] to the airlock assembly.", \
user.visible_message("<span class='notice'>[user] adds [G.name] to the airlock assembly.</span>", \
"<span class='notice'>You start to install [G.name] into the airlock assembly...</span>")
if(do_after(user, 40, target = src))
if(G.get_amount() < 1 || glass)
@@ -207,7 +207,7 @@
var/M = G.sheettype
if(G.get_amount() >= 2)
playsound(src, 'sound/items/crowbar.ogg', 100, 1)
user.visible_message("[user] adds [G.name] to the airlock assembly.", \
user.visible_message("<span class='notice'>[user] adds [G.name] to the airlock assembly.</span>", \
"<span class='notice'>You start to install [G.name] into the airlock assembly...</span>")
if(do_after(user, 40, target = src))
if(G.get_amount() < 2 || mineral)
@@ -225,7 +225,7 @@
to_chat(user, "<span class='warning'>You cannot add [G] to [src]!</span>")
else if((W.tool_behaviour == TOOL_SCREWDRIVER) && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER )
user.visible_message("[user] finishes the airlock.", \
user.visible_message("<span class='notice'>[user] finishes the airlock.</span>", \
"<span class='notice'>You start finishing the airlock...</span>")
if(W.use_tool(src, user, 40, volume=100))
code/game/objects/structures/false_walls.dm
+1 -1
View File
@@ -114,7 +114,7 @@
return ..()
/obj/structure/falsewall/proc/dismantle(mob/user, disassembled=TRUE, obj/item/tool = null)
user.visible_message("[user] dismantles the false wall.", "<span class='notice'>You dismantle the false wall.</span>")
user.visible_message("<span class='notice'>[user] dismantles the false wall.</span>", "<span class='notice'>You dismantle the false wall.</span>")
if(tool)
tool.play_tool_sound(src, 100)
else
code/game/objects/structures/fireaxe.dm
+1 -1
View File
@@ -166,7 +166,7 @@
add_overlay("glass_raised")
/obj/structure/fireaxecabinet/proc/toggle_lock(mob/user)
to_chat(user, "<span class='caution'> Resetting circuitry...</span>")
to_chat(user, "<span class='caution'>Resetting circuitry...</span>")
playsound(src, 'sound/machines/locktoggle.ogg', 50, 1)
if(do_after(user, 20, target = src))
to_chat(user, "<span class='caution'>You [locked ? "disable" : "re-enable"] the locking modules.</span>")
code/game/objects/structures/flora.dm
+2 -2
View File
@@ -17,9 +17,9 @@
if(W.is_sharp() && W.force > 0)
if(W.hitsound)
playsound(get_turf(src), W.hitsound, 100, 0, 0)
user.visible_message("<span class='notice'>[user] begins to cut down [src] with [W].</span>","<span class='notice'>You begin to cut down [src] with [W].</span>", "You hear the sound of sawing.")
user.visible_message("<span class='notice'>[user] begins to cut down [src] with [W].</span>","<span class='notice'>You begin to cut down [src] with [W].</span>", "<span class='italics'>You hear the sound of sawing.</span>")
if(do_after(user, 1000/W.force, target = src)) //5 seconds with 20 force, 8 seconds with a hatchet, 20 seconds with a shard.
user.visible_message("<span class='notice'>[user] fells [src] with the [W].</span>","<span class='notice'>You fell [src] with the [W].</span>", "You hear the sound of a tree falling.")
user.visible_message("<span class='notice'>[user] fells [src] with the [W].</span>","<span class='notice'>You fell [src] with the [W].</span>", "<span class='italics'>You hear the sound of a tree falling.</span>")
playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 100 , 0, 0)
for(var/i=1 to log_amount)
new /obj/item/grown/log/tree(get_turf(src))
code/game/objects/structures/girders.dm
+1 -1
View File
@@ -207,7 +207,7 @@
if(state == GIRDER_DISPLACED)
user.visible_message("<span class='warning'>[user] disassembles the girder.</span>",
"<span class='notice'>You start to disassemble the girder...</span>",
"You hear clanking and banging noises.")
"<span class='italics'>You hear clanking and banging noises.</span>")
if(tool.use_tool(src, user, 40, volume=100))
if(state != GIRDER_DISPLACED)
return
code/game/objects/structures/janicart.dm
+1 -2
View File
@@ -80,7 +80,7 @@
else if(mybag)
mybag.attackby(I, user)
else if(I.tool_behaviour == TOOL_CROWBAR)
user.visible_message("[user] begins to empty the contents of [src].", "<span class='notice'>You begin to empty the contents of [src]...</span>")
user.visible_message("<span class='notice'>[user] begins to empty the contents of [src].</span>", "<span class='notice'>You begin to empty the contents of [src]...</span>")
if(I.use_tool(src, user, 30))
to_chat(usr, "<span class='notice'>You empty the contents of [src]'s bucket onto the floor.</span>")
reagents.reaction(src.loc)
@@ -164,4 +164,3 @@
add_overlay("cart_sign[signs]")
if(reagents.total_volume > 0)
add_overlay("cart_water")
code/game/objects/structures/kitchen_spike.dm
+3 -6
View File
@@ -98,20 +98,17 @@
if(buckled_mob)
var/mob/living/M = buckled_mob
if(M != user)
M.visible_message(\
"[user] tries to pull [M] free of [src]!",\
M.visible_message("<span class='notice'>[user] tries to pull [M] free of [src]!</span>",\
"<span class='notice'>[user] is trying to pull you off [src], opening up fresh wounds!</span>",\
"<span class='italics'>You hear a squishy wet noise.</span>")
if(!do_after(user, 300, target = src))
if(M && M.buckled)
M.visible_message(\
"[user] fails to free [M]!",\
M.visible_message("<span class='notice'>[user] fails to free [M]!</span>",\
"<span class='notice'>[user] fails to pull you off of [src].</span>")
return
else
M.visible_message(\
"<span class='warning'>[M] struggles to break free from [src]!</span>",\
M.visible_message("<span class='warning'>[M] struggles to break free from [src]!</span>",\
"<span class='notice'>You struggle to break free from [src], exacerbating your wounds! (Stay still for two minutes.)</span>",\
"<span class='italics'>You hear a wet squishing noise..</span>")
M.adjustBruteLoss(30)
code/game/objects/structures/ladders.dm
+2 -2
View File
@@ -135,9 +135,9 @@
/obj/structure/ladder/proc/show_fluff_message(going_up, mob/user)
if(going_up)
user.visible_message("[user] climbs up [src].","<span class='notice'>You climb up [src].</span>")
user.visible_message("<span class='notice'>[user] climbs up [src].</span>", "<span class='notice'>You climb up [src].</span>")
else
user.visible_message("[user] climbs down [src].","<span class='notice'>You climb down [src].</span>")
user.visible_message("<span class='notice'>[user] climbs down [src].</span>", "<span class='notice'>You climb down [src].</span>")
// Indestructible away mission ladders which link based on a mapped ID and height value rather than X/Y/Z.
code/game/objects/structures/mineral_doors.dm
+6 -6
View File
@@ -162,12 +162,12 @@
to_chat(user, "<span class='warning'>[src] is still firmly secured to the ground!</span>")
return
user.visible_message("[user] starts to weld apart [src]!", "<span class='notice'>You start welding apart [src].</span>")
user.visible_message("<span class='notice'>[user] starts to weld apart [src]!</span>", "<span class='notice'>You start welding apart [src].</span>")
if(!I.use_tool(src, user, 60, 5, 50))
to_chat(user, "<span class='warning'>You failed to weld apart [src]!/span>")
return
user.visible_message("[user] welded [src] into pieces!", "<span class='notice'>You welded apart [src]!</span>")
user.visible_message("<span class='notice'>[user] welded [src] into pieces!</span>", "<span class='notice'>You welded apart [src]!</span>")
deconstruct(TRUE)
/obj/structure/mineral_door/proc/crowbar_door(mob/living/user, obj/item/I) //if the door is flammable, call this in crowbar_act() so we can still decon it
@@ -176,12 +176,12 @@
to_chat(user, "<span class='warning'>[src] is still firmly secured to the ground!</span>")
return
user.visible_message("[user] starts to pry apart [src]!", "<span class='notice'>You start prying apart [src].</span>")
user.visible_message("<span class='notice'>[user] starts to pry apart [src]!</span>", "<span class='notice'>You start prying apart [src].</span>")
if(!I.use_tool(src, user, 60, volume = 50))
to_chat(user, "<span class='warning'>You failed to pry apart [src]!/span>")
return
user.visible_message("[user] pried [src] into pieces!", "<span class='notice'>You pried apart [src]!</span>")
user.visible_message("<span class='notice'>[user] pried [src] into pieces!</span>", "<span class='notice'>You pried apart [src]!</span>")
deconstruct(TRUE)
@@ -333,11 +333,11 @@
return
if((user.a_intent != INTENT_HARM) && istype(I, /obj/item/paper) && (obj_integrity < max_integrity))
user.visible_message("[user] starts to patch the holes in [src].", "<span class='notice'>You start patching some of the holes in [src]!</span>")
user.visible_message("<span class='notice'>[user] starts to patch the holes in [src].</span>", "<span class='notice'>You start patching some of the holes in [src]!</span>")
if(do_after(user, 20, TRUE, src))
obj_integrity = min(obj_integrity+4,max_integrity)
qdel(I)
user.visible_message("[user] patches some of the holes in [src].", "<span class='notice'>You patch some of the holes in [src]!</span>")
user.visible_message("<span class='notice'>[user] patches some of the holes in [src].</span>", "<span class='notice'>You patch some of the holes in [src]!</span>")
return TRUE
return ..()
code/game/objects/structures/plasticflaps.dm
+3 -3
View File
@@ -29,10 +29,10 @@
add_fingerprint(user)
var/action = anchored ? "unscrews [src] from" : "screws [src] to"
var/uraction = anchored ? "unscrew [src] from " : "screw [src] to"
user.visible_message("<span class='warning'>[user] [action] the floor.</span>", "<span class='notice'>You start to [uraction] the floor...</span>", "You hear rustling noises.")
user.visible_message("<span class='warning'>[user] [action] the floor.</span>", "<span class='notice'>You start to [uraction] the floor...</span>", "<span class='italics'>You hear rustling noises.</span>")
if(W.use_tool(src, user, 100, volume=100, extra_checks = CALLBACK(src, .proc/check_anchored_state, anchored)))
setAnchored(!anchored)
to_chat(user, "<span class='notice'> You [anchored ? "unscrew" : "screw"] [src] from the floor.</span>")
to_chat(user, "<span class='notice'>You [anchored ? "unscrew" : "screw"] [src] from the floor.</span>")
return TRUE
else
return TRUE
@@ -40,7 +40,7 @@
/obj/structure/plasticflaps/wirecutter_act(mob/living/user, obj/item/W)
. = ..()
if(!anchored)
user.visible_message("<span class='warning'>[user] cuts apart [src].</span>", "<span class='notice'>You start to cut apart [src].</span>", "You hear cutting.")
user.visible_message("<span class='warning'>[user] cuts apart [src].</span>", "<span class='notice'>You start to cut apart [src].</span>", "<span class='italics'>You hear cutting.</span>")
if(W.use_tool(src, user, 50, volume=100))
if(anchored)
return TRUE
code/game/objects/structures/reflector.dm
+5 -5
View File
@@ -88,7 +88,7 @@
if(anchored)
to_chat(user, "<span class='warning'>Unweld [src] from the floor first!</span>")
return
user.visible_message("[user] starts to dismantle [src].", "<span class='notice'>You start to dismantle [src]...</span>")
user.visible_message("<span class='notice'>[user] starts to dismantle [src].</span>", "<span class='notice'>You start to dismantle [src]...</span>")
if(W.use_tool(src, user, 80, volume=50))
to_chat(user, "<span class='notice'>You dismantle [src].</span>")
new framebuildstacktype(drop_location(), framebuildstackamount)
@@ -100,19 +100,19 @@
if(!W.tool_start_check(user, amount=0))
return
user.visible_message("[user] starts to repair [src].",
user.visible_message("<span class='notice'>[user] starts to repair [src].</span>",
"<span class='notice'>You begin repairing [src]...</span>",
"<span class='italics'>You hear welding.</span>")
if(W.use_tool(src, user, 40, volume=40))
obj_integrity = max_integrity
user.visible_message("[user] has repaired [src].", \
user.visible_message("<span class='notice'>[user] has repaired [src].</span>", \
"<span class='notice'>You finish repairing [src].</span>")
else if(!anchored)
if(!W.tool_start_check(user, amount=0))
return
user.visible_message("[user] starts to weld [src] to the floor.",
user.visible_message("<span class='notice'>[user] starts to weld [src] to the floor.</span>",
"<span class='notice'>You start to weld [src] to the floor...</span>",
"<span class='italics'>You hear welding.</span>")
if (W.use_tool(src, user, 20, volume=50))
@@ -122,7 +122,7 @@
if(!W.tool_start_check(user, amount=0))
return
user.visible_message("[user] starts to cut [src] free from the floor.",
user.visible_message("<span class='notice'>[user] starts to cut [src] free from the floor.</span>",
"<span class='notice'>You start to cut [src] free from the floor...</span>",
"<span class='italics'>You hear welding.</span>")
if (W.use_tool(src, user, 20, volume=50))
code/game/objects/structures/statues.dm
+3 -3
View File
@@ -29,10 +29,10 @@
if(!W.tool_start_check(user, amount=0))
return FALSE
user.visible_message("[user] is slicing apart the [name].", \
user.visible_message("<span class='notice'>[user] is slicing apart the [name].</span>", \
"<span class='notice'>You are slicing apart the [name]...</span>")
if(W.use_tool(src, user, 40, volume=50))
user.visible_message("[user] slices apart the [name].", \
user.visible_message("<span class='notice'>[user] slices apart the [name].</span>", \
"<span class='notice'>You slice apart the [name]!</span>")
deconstruct(TRUE)
return
@@ -291,4 +291,4 @@
/obj/structure/statue/snow/snowlegion
name = "snowlegion"
desc = "Looks like that weird kid with the tiger plushie has been round here again."
icon_state = "snowlegion"
icon_state = "snowlegion"
code/game/objects/structures/tables_racks.dm
+1 -1
View File
@@ -154,7 +154,7 @@
var/obj/item/storage/bag/tray/T = I
if(T.contents.len > 0) // If the tray isn't empty
SEND_SIGNAL(I, COMSIG_TRY_STORAGE_QUICK_EMPTY, drop_location())
user.visible_message("[user] empties [I] on [src].")
user.visible_message("<span class='notice'>[user] empties [I] on [src].</span>")
return
// If the tray IS empty, continue on (tray will be placed on the table like other items)
code/game/objects/structures/transit_tubes/station.dm
+2 -3
View File
@@ -56,7 +56,7 @@
R.transfer_fingerprints_to(TP)
TP.add_fingerprint(user)
TP.setDir(turn(src.dir, -90))
user.visible_message("[user] inserts [R].", "<span class='notice'>You insert [R].</span>")
user.visible_message("<span class='notice'>[user] inserts [R].</span>", "<span class='notice'>You insert [R].</span>")
qdel(R)
@@ -87,7 +87,7 @@
else if(open_status == STATION_TUBE_OPEN)
if(pod.contents.len && user.loc != pod)
user.visible_message("[user] starts emptying [pod]'s contents onto the floor.", "<span class='notice'>You start emptying [pod]'s contents onto the floor...</span>")
user.visible_message("<span class='notice'>[user] starts emptying [pod]'s contents onto the floor.</span>", "<span class='notice'>You start emptying [pod]'s contents onto the floor...</span>")
if(do_after(user, 10, target = src)) //So it doesn't default to close_animation() on fail
if(pod && pod.loc == loc)
for(var/atom/movable/AM in pod)
@@ -209,4 +209,3 @@
/obj/structure/transit_tube/station/reverse/flipped/init_tube_dirs()
..()
boarding_dir = dir
code/game/objects/structures/transit_tubes/transit_tube.dm
+1 -1
View File
@@ -42,7 +42,7 @@
for(var/obj/structure/transit_tube_pod/pod in src.loc)
to_chat(user, "<span class='warning'>Remove the pod first!</span>")
return
user.visible_message("[user] starts to detach \the [src].", "<span class='notice'>You start to detach the [name]...</span>")
user.visible_message("<span class='notice'>[user] starts to detach \the [src].</span>", "<span class='notice'>You start to detach the [name]...</span>")
if(W.use_tool(src, user, time_to_unwrench, volume=50))
to_chat(user, "<span class='notice'>You detach the [name].</span>")
var/obj/structure/c_transit_tube/R = new tube_construction(loc)
code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+2 -2
View File
@@ -31,7 +31,7 @@
if(!moving)
I.play_tool_sound(src)
if(contents.len)
user.visible_message("[user] empties \the [src].", "<span class='notice'>You empty \the [src].</span>")
user.visible_message("<span class='notice'>[user] empties \the [src].</span>", "<span class='notice'>You empty \the [src].</span>")
empty_pod()
else
deconstruct(TRUE, user)
@@ -44,7 +44,7 @@
if(user)
location = user.loc
add_fingerprint(user)
user.visible_message("[user] removes [src].", "<span class='notice'>You remove [src].</span>")
user.visible_message("<span class='notice'>[user] removes [src].</span>", "<span class='notice'>You remove [src].</span>")
var/obj/structure/c_transit_tube_pod/R = new/obj/structure/c_transit_tube_pod(location)
transfer_fingerprints_to(R)
R.setDir(dir)
code/game/objects/structures/watercloset.dm
+3 -3
View File
@@ -79,7 +79,7 @@
to_chat(user, "<span class='notice'>You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]...</span>")
playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1)
if(I.use_tool(src, user, 30))
user.visible_message("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!", "<span class='notice'>You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!</span>", "<span class='italics'>You hear grinding porcelain.</span>")
user.visible_message("<span class='notice'>[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!</span>", "<span class='notice'>You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!</span>", "<span class='italics'>You hear grinding porcelain.</span>")
cistern = !cistern
update_icon()
@@ -186,7 +186,7 @@
to_chat(user, "<span class='notice'>You start to [exposed ? "screw the cap back into place" : "unscrew the cap to the drain protector"]...</span>")
playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1)
if(I.use_tool(src, user, 20))
user.visible_message("[user] [exposed ? "screws the cap back into place" : "unscrew the cap to the drain protector"]!",
user.visible_message("<span class='notice'>[user] [exposed ? "screws the cap back into place" : "unscrew the cap to the drain protector"]!</span>",
"<span class='notice'>You [exposed ? "screw the cap back into place" : "unscrew the cap on the drain"]!</span>",
"<span class='italics'>You hear metal and squishing noises.</span>")
exposed = !exposed
@@ -414,7 +414,7 @@
return TRUE
user.visible_message("<span class='warning'>[user] cuts apart [src].</span>",
"<span class='notice'>You start to cut apart [src].</span>", "You hear cutting.")
"<span class='notice'>You start to cut apart [src].</span>", "<span class='italics'>You hear cutting.</span>")
if(I.use_tool(src, user, 50, volume=100) && !anchored)
to_chat(user, "<span class='notice'>You cut apart [src].</span>")
deconstruct()
code/game/objects/structures/windoor_assembly.dm
+8 -8
View File
@@ -91,7 +91,7 @@
if(!W.tool_start_check(user, amount=0))
return
user.visible_message("[user] disassembles the windoor assembly.",
user.visible_message("<span class='notice'>[user] disassembles the windoor assembly.</span>",
"<span class='notice'>You start to disassemble the windoor assembly...</span>")
if(W.use_tool(src, user, 40, volume=50))
@@ -110,7 +110,7 @@
if(WD.dir == dir)
to_chat(user, "<span class='warning'>There is already a windoor in that location!</span>")
return
user.visible_message("[user] secures the windoor assembly to the floor.",
user.visible_message("<span class='notice'>[user] secures the windoor assembly to the floor.</span>",
"<span class='notice'>You start to secure the windoor assembly to the floor...</span>")
if(W.use_tool(src, user, 40, volume=100))
@@ -129,7 +129,7 @@
//Unwrenching an unsecure assembly un-anchors it. Step 4 undone
else if(W.tool_behaviour == TOOL_WRENCH && anchored)
user.visible_message("[user] unsecures the windoor assembly to the floor.",
user.visible_message("<span class='notice'>[user] unsecures the windoor assembly to the floor.</span>",
"<span class='notice'>You start to unsecure the windoor assembly to the floor...</span>")
if(W.use_tool(src, user, 40, volume=100))
@@ -164,7 +164,7 @@
//Adding cable to the assembly. Step 5 complete.
else if(istype(W, /obj/item/stack/cable_coil) && anchored)
user.visible_message("[user] wires the windoor assembly.", "<span class='notice'>You start to wire the windoor assembly...</span>")
user.visible_message("<span class='notice'>[user] wires the windoor assembly.</span>", "<span class='notice'>You start to wire the windoor assembly...</span>")
if(do_after(user, 40, target = src))
if(!src || !anchored || src.state != "01")
@@ -186,7 +186,7 @@
//Removing wire from the assembly. Step 5 undone.
if(W.tool_behaviour == TOOL_WIRECUTTER)
user.visible_message("[user] cuts the wires from the airlock assembly.", "<span class='notice'>You start to cut the wires from airlock assembly...</span>")
user.visible_message("<span class='notice'>[user] cuts the wires from the airlock assembly.</span>", "<span class='notice'>You start to cut the wires from airlock assembly...</span>")
if(W.use_tool(src, user, 40, volume=100))
if(state != "02")
@@ -205,7 +205,7 @@
if(!user.transferItemToLoc(W, src))
return
W.play_tool_sound(src, 100)
user.visible_message("[user] installs the electronics into the airlock assembly.",
user.visible_message("<span class='notice'>[user] installs the electronics into the airlock assembly.</span>",
"<span class='notice'>You start to install electronics into the airlock assembly...</span>")
if(do_after(user, 40, target = src))
@@ -223,7 +223,7 @@
if(!electronics)
return
user.visible_message("[user] removes the electronics from the airlock assembly.",
user.visible_message("<span class='notice'>[user] removes the electronics from the airlock assembly.</span>",
"<span class='notice'>You start to uninstall electronics from the airlock assembly...</span>")
if(W.use_tool(src, user, 40, volume=100) && electronics)
@@ -251,7 +251,7 @@
to_chat(usr, "<span class='warning'>The assembly is missing electronics!</span>")
return
user << browse(null, "window=windoor_access")
user.visible_message("[user] pries the windoor into the frame.",
user.visible_message("<span class='notice'>[user] pries the windoor into the frame.</span>",
"<span class='notice'>You start prying the windoor into the frame...</span>")
if(W.use_tool(src, user, 40, volume=100) && electronics)
code/game/objects/structures/window.dm
+7 -7
View File
@@ -187,7 +187,7 @@
to_chat(user, "<span class='notice'>You [anchored ? "fasten the window to":"unfasten the window from"] the floor.</span>")
return
else if(I.tool_behaviour == TOOL_WRENCH && !anchored)
to_chat(user, "<span class='notice'> You begin to disassemble [src]...</span>")
to_chat(user, "<span class='notice'>You begin to disassemble [src]...</span>")
if(I.use_tool(src, user, decon_speed, volume = 75, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored)))
var/obj/item/stack/sheet/G = new glass_type(user.loc, glass_amount)
G.add_fingerprint(user)
@@ -421,12 +421,12 @@
setAnchored(FALSE)
return
return ..()
/obj/structure/window/proc/cool_bolts()
if(state == RWINDOW_BOLTS_HEATED)
state = RWINDOW_SECURE
visible_message("<span class='notice'>The bolts on \the [src] look like they've cooled off...</span>")
/obj/structure/window/reinforced/examine(mob/user)
. = ..()
switch(state)
@@ -546,7 +546,7 @@
setAnchored(FALSE)
return
return ..()
/obj/structure/window/plasma/reinforced/examine(mob/user)
. = ..()
switch(state)
@@ -837,7 +837,7 @@
add_fingerprint(user)
if(user.a_intent != INTENT_HARM)
user.changeNext_move(CLICK_CD_MELEE)
user.visible_message("[user] knocks on [src].")
user.visible_message("<span class='notice'>[user] knocks on [src].</span>")
playsound(src, "pageturn", 50, 1)
else
take_damage(4,BRUTE,"melee", 0)
@@ -865,11 +865,11 @@
if(user.a_intent == INTENT_HARM)
return ..()
if(istype(W, /obj/item/paper) && obj_integrity < max_integrity)
user.visible_message("[user] starts to patch the holes in \the [src].")
user.visible_message("<span class='notice'>[user] starts to patch the holes in \the [src].</span>")
if(do_after(user, 20, target = src))
obj_integrity = min(obj_integrity+4,max_integrity)
qdel(W)
user.visible_message("[user] patches some of the holes in \the [src].")
user.visible_message("<span class='notice'>[user] patches some of the holes in \the [src].</span>")
if(obj_integrity == max_integrity)
update_icon()
return