diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 9a01436ef93..4e649795ab8 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -128,7 +128,7 @@ SUBSYSTEM_DEF(vote) // No delay in case the restart is due to lag SSticker.Reboot("Restart vote successful.", "restart vote", 1) else - to_chat(world, "Notice:Restart vote will not restart the server automatically because there are active admins on.") + to_chat(world, span_boldannounce("Notice: Restart vote will not restart the server automatically because there are active admins on.")) message_admins("A restart vote has passed, but there are active admins on with +server, so it has been canceled. If you wish, you may restart the server.") return . diff --git a/code/datums/ai/dog/dog_controller.dm b/code/datums/ai/dog/dog_controller.dm index 45557ac6b24..38f70e03ed9 100644 --- a/code/datums/ai/dog/dog_controller.dm +++ b/code/datums/ai/dog/dog_controller.dm @@ -35,7 +35,7 @@ /datum/ai_controller/dog/UnpossessPawn(destroy) var/obj/item/carried_item = blackboard[BB_SIMPLE_CARRY_ITEM] if(carried_item) - pawn.visible_message("[pawn] drops [carried_item].") + pawn.visible_message(span_danger("[pawn] drops [carried_item]")) carried_item.forceMove(pawn.drop_location()) blackboard[BB_SIMPLE_CARRY_ITEM] = null UnregisterSignal(pawn, list(COMSIG_ATOM_ATTACK_HAND, COMSIG_PARENT_EXAMINE, COMSIG_CLICK_ALT, COMSIG_LIVING_DEATH, COMSIG_GLOB_CARBON_THROW_THING, COMSIG_PARENT_QDELETING)) @@ -98,7 +98,7 @@ var/list/friends = blackboard[BB_DOG_FRIENDS] if(blackboard[BB_SIMPLE_CARRY_ITEM] && !current_movement_target && friends[WEAKREF(user)]) var/obj/item/carried_item = blackboard[BB_SIMPLE_CARRY_ITEM] - pawn.visible_message("[pawn] drops [carried_item] at [user]'s feet!") + pawn.visible_message(span_danger("[pawn] drops [carried_item] at [user]'s feet!")) // maybe have a dedicated proc for dropping things carried_item.forceMove(get_turf(user)) blackboard[BB_SIMPLE_CARRY_ITEM] = null @@ -141,7 +141,7 @@ if(!carried_item) return - ol_yeller.visible_message("[ol_yeller] drops [carried_item] as [ol_yeller.p_they()] die[ol_yeller.p_s()].") + ol_yeller.visible_message(span_danger("[ol_yeller] drops [carried_item] as [ol_yeller.p_they()] die[ol_yeller.p_s()].")) carried_item.forceMove(ol_yeller.drop_location()) blackboard[BB_SIMPLE_CARRY_ITEM] = null diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm index 4727971f4fa..1f7e553f89f 100644 --- a/code/datums/brain_damage/mild.dm +++ b/code/datums/brain_damage/mild.dm @@ -175,7 +175,7 @@ /datum/brain_trauma/mild/nervous_cough/on_life(delta_time, times_fired) if(DT_PROB(6, delta_time) && !HAS_TRAIT(owner, TRAIT_SOOTHED_THROAT)) if(prob(5)) - to_chat(owner, "[pick("You have a coughing fit!", "You can't stop coughing!")]") + to_chat(owner, span_warning("[pick("You have a coughing fit!", "You can't stop coughing!")]")) owner.Immobilize(20) owner.emote("cough") addtimer(CALLBACK(owner, /mob/.proc/emote, "cough"), 6) diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm index 1ac3d15eddf..891f0c222ea 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -65,7 +65,7 @@ span_danger("You start slicing [H]'s throat!"), \ span_hear("You hear a cutting noise!"), ignored_mobs = H) H.show_message(span_userdanger("Your throat is being slit by [user]!"), MSG_VISUAL, \ - "Something is cutting into your neck!", NONE) + span_userdanger("Something is cutting into your neck!"), NONE) log_combat(user, H, "attempted throat slitting", source) playsound(H.loc, butcher_sound, 50, TRUE, -1) diff --git a/code/datums/components/dejavu.dm b/code/datums/components/dejavu.dm index 414289e7ca4..236fe83629b 100644 --- a/code/datums/components/dejavu.dm +++ b/code/datums/components/dejavu.dm @@ -67,7 +67,7 @@ return ..() /datum/component/dejavu/proc/rewind() - to_chat(parent, "You remember a time not so long ago...") + to_chat(parent, span_notice("You remember a time not so long ago...")) //comes after healing so new limbs comically drop to the floor if(starting_turf) @@ -82,7 +82,7 @@ if(rewinds_remaining) addtimer(CALLBACK(src, rewind_type), rewind_interval) else - to_chat(parent, "But the memory falls out of your reach.") + to_chat(parent, span_notice("But the memory falls out of your reach.")) qdel(src) /datum/component/dejavu/proc/rewind_living() diff --git a/code/datums/components/riding/riding_mob.dm b/code/datums/components/riding/riding_mob.dm index 5a4ee7fbe1b..70a6ccdc54d 100644 --- a/code/datums/components/riding/riding_mob.dm +++ b/code/datums/components/riding/riding_mob.dm @@ -163,11 +163,11 @@ return COMPONENT_RIDDEN_ALLOW_Z_MOVE if(!can_be_driven) if(z_move_flags & ZMOVE_FEEDBACK) - to_chat(rider, "[movable_parent] cannot be driven around. Unbuckle from [movable_parent.p_them()] first.") + to_chat(rider, span_warning("[movable_parent] cannot be driven around. Unbuckle from [movable_parent.p_them()] first.")) return COMPONENT_RIDDEN_STOP_Z_MOVE if(!ride_check(rider, FALSE)) if(z_move_flags & ZMOVE_FEEDBACK) - to_chat(rider, "You're unable to ride [movable_parent] right now!") + to_chat(rider, span_warning("You're unable to ride [movable_parent] right now!")) return COMPONENT_RIDDEN_STOP_Z_MOVE return COMPONENT_RIDDEN_ALLOW_Z_MOVE diff --git a/code/datums/components/shielded.dm b/code/datums/components/shielded.dm index 7450c92295e..2ae447d2d09 100644 --- a/code/datums/components/shielded.dm +++ b/code/datums/components/shielded.dm @@ -154,7 +154,7 @@ /// Default on_hit proc, since cult robes are stupid and have different descriptions/sparks /datum/component/shielded/proc/default_run_hit_callback(mob/living/owner, attack_text, current_charges) do_sparks(2, TRUE, owner) - owner.visible_message("[owner]'s shields deflect [attack_text] in a shower of sparks!") + owner.visible_message(span_danger("[owner]'s shields deflect [attack_text] in a shower of sparks!")) if(current_charges <= 0) owner.visible_message(span_warning("[owner]'s shield overloads!")) diff --git a/code/datums/diseases/advance/symptoms/cough.dm b/code/datums/diseases/advance/symptoms/cough.dm index 0e4dbae3081..6159c63eee7 100644 --- a/code/datums/diseases/advance/symptoms/cough.dm +++ b/code/datums/diseases/advance/symptoms/cough.dm @@ -63,7 +63,7 @@ BONUS switch(A.stage) if(1, 2, 3) if(prob(base_message_chance) && !suppress_warning) - to_chat(M, "[pick("You swallow excess mucus.", "You lightly cough.")]") + to_chat(M, span_warning("[pick("You swallow excess mucus.", "You lightly cough.")]")) else M.emote("cough") if(M.CanSpreadAirborneDisease()) @@ -73,7 +73,7 @@ BONUS if(I && I.w_class == WEIGHT_CLASS_TINY) M.dropItemToGround(I) if(power >= 2 && prob(30)) - to_chat(M, "[pick("You have a coughing fit!", "You can't stop coughing!")]") + to_chat(M, span_userdanger("[pick("You have a coughing fit!", "You can't stop coughing!")]")) M.Immobilize(20) addtimer(CALLBACK(M, /mob/.proc/emote, "cough"), 6) addtimer(CALLBACK(M, /mob/.proc/emote, "cough"), 12) diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 01b2c597fb7..79c091641a1 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -849,5 +849,5 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) return eyes.Remove(src) qdel(eyes) - visible_message(span_notice("[src] looks up and their eyes melt away!"), "='userdanger'>I understand now.") + visible_message(span_notice("[src] looks up and their eyes melt away!"), span_userdanger("I understand now.")) addtimer(CALLBACK(src, .proc/adjustOrganLoss, ORGAN_SLOT_BRAIN, 200), 20) diff --git a/code/datums/elements/digitalcamo.dm b/code/datums/elements/digitalcamo.dm index 8c9b5e88a5a..dcfbbd3b650 100644 --- a/code/datums/elements/digitalcamo.dm +++ b/code/datums/elements/digitalcamo.dm @@ -42,7 +42,7 @@ /datum/element/digitalcamo/proc/on_examine(datum/source, mob/M) SIGNAL_HANDLER - to_chat(M, "[source.p_their()] skin seems to be shifting and morphing like is moving around below it.") + to_chat(M, span_warning("[source.p_their()] skin seems to be shifting like something is moving below it.")) /datum/element/digitalcamo/proc/can_track(datum/source) SIGNAL_HANDLER diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 13a00e53f2d..90439f347fc 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -669,7 +669,7 @@ status_type = STATUS_EFFECT_UNIQUE duration = 300 tick_interval = 10 - examine_text = "SUBJECTPRONOUN seems slow and unfocused." + examine_text = span_warning("SUBJECTPRONOUN seems slow and unfocused.") var/stun = TRUE alert_type = /atom/movable/screen/alert/status_effect/trance @@ -690,7 +690,7 @@ ADD_TRAIT(owner, TRAIT_MUTE, STATUS_EFFECT_TRAIT) owner.add_client_colour(/datum/client_colour/monochrome/trance) owner.visible_message("[stun ? span_warning("[owner] stands still as [owner.p_their()] eyes seem to focus on a distant point.") : ""]", \ - span_warning("[pick("You feel your thoughts slow down...", "You suddenly feel extremely dizzy...", "You feel like you're in the middle of a dream...","You feel incredibly relaxed...")]")) + span_warning(pick("You feel your thoughts slow down...", "You suddenly feel extremely dizzy...", "You feel like you're in the middle of a dream...","You feel incredibly relaxed..."))) return TRUE /datum/status_effect/trance/on_creation(mob/living/new_owner, _duration, _stun = TRUE) @@ -862,25 +862,28 @@ switch(msg_stage) if(0 to 300) if(prob(1)) - fake_msg = pick(span_warning("[pick("Your head hurts.", "Your head pounds.")]"), - span_warning("[pick("You're having difficulty breathing.", "Your breathing becomes heavy.")]"), - span_warning("[pick("You feel dizzy.", "Your head spins.")]"), - "[pick("You swallow excess mucus.", "You lightly cough.")]", - span_warning("[pick("Your head hurts.", "Your mind blanks for a moment.")]"), - span_warning("[pick("Your throat hurts.", "You clear your throat.")]")) + fake_msg = pick( + span_warning(pick("Your head hurts.", "Your head pounds.")), + span_warning(pick("You're having difficulty breathing.", "Your breathing becomes heavy.")), + span_warning(pick("You feel dizzy.", "Your head spins.")), + span_warning(pick("You swallow excess mucus.", "You lightly cough.")), + span_warning(pick("Your head hurts.", "Your mind blanks for a moment.")), + span_warning(pick("Your throat hurts.", "You clear your throat."))) if(301 to 600) if(prob(2)) - fake_msg = pick(span_warning("[pick("Your head hurts a lot.", "Your head pounds incessantly.")]"), - span_warning("[pick("Your windpipe feels like a straw.", "Your breathing becomes tremendously difficult.")]"), + fake_msg = pick( + span_warning(pick("Your head hurts a lot.", "Your head pounds incessantly.")), + span_warning(pick("Your windpipe feels like a straw.", "Your breathing becomes tremendously difficult.")), span_warning("You feel very [pick("dizzy","woozy","faint")]."), - span_warning("[pick("You hear a ringing in your ear.", "Your ears pop.")]"), + span_warning(pick("You hear a ringing in your ear.", "Your ears pop.")), span_warning("You nod off for a moment.")) else if(prob(3)) if(prob(50))// coin flip to throw a message or an emote - fake_msg = pick(span_userdanger("[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]"), - span_userdanger("[pick("Your lungs hurt!", "It hurts to breathe!")]"), - span_warning("[pick("You feel nauseated.", "You feel like you're going to throw up!")]")) + fake_msg = pick( + span_userdanger(pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")), + span_userdanger(pick("Your lungs hurt!", "It hurts to breathe!")), + span_warning(pick("You feel nauseated.", "You feel like you're going to throw up!"))) else fake_emote = pick("cough", "sniff", "sneeze") @@ -994,7 +997,7 @@ status_type = STATUS_EFFECT_REFRESH alert_type = /atom/movable/screen/alert/status_effect/ants duration = 2 MINUTES //Keeping the normal timer makes sure people can't somehow dump 300+ ants on someone at once so they stay there for like 30 minutes. Max w/ 1 dump is 57.6 brute. - examine_text = "SUBJECTPRONOUN is covered in ants!" + examine_text = span_warning("SUBJECTPRONOUN is covered in ants!") processing_speed = STATUS_EFFECT_NORMAL_PROCESS /// Will act as the main timer as well as changing how much damage the ants do. var/ants_remaining = 0 @@ -1002,7 +1005,7 @@ /datum/status_effect/ants/on_creation(mob/living/new_owner, amount_left) if(isnum(amount_left) && new_owner.stat < HARD_CRIT) if(new_owner.stat < UNCONSCIOUS) // Unconcious people won't get messages - to_chat(new_owner, "You're covered in ants!") + to_chat(new_owner, span_userdanger("You're covered in ants!")) ants_remaining += amount_left RegisterSignal(new_owner, COMSIG_COMPONENT_CLEAN_ACT, .proc/ants_washed) . = ..() @@ -1012,7 +1015,7 @@ if(isnum(amount_left) && ants_remaining >= 1 && victim.stat < HARD_CRIT) if(victim.stat < UNCONSCIOUS) // Unconcious people won't get messages if(!prob(1)) // 99% - to_chat(victim, "You're covered in MORE ants!") + to_chat(victim, span_userdanger("You're covered in MORE ants!")) else // 1% victim.say("AAHH! THIS SITUATION HAS ONLY BEEN MADE WORSE WITH THE ADDITION OF YET MORE ANTS!!", forced = /datum/status_effect/ants) ants_remaining += amount_left @@ -1020,7 +1023,7 @@ /datum/status_effect/ants/on_remove() ants_remaining = 0 - to_chat(owner, "All of the ants are off of your body!") + to_chat(owner, span_notice("All of the ants are off of your body!")) UnregisterSignal(owner, COMSIG_COMPONENT_CLEAN_ACT, .proc/ants_washed) . = ..() @@ -1043,18 +1046,18 @@ switch(rand(1,50)) if (1 to 8) //16% Chance var/obj/item/bodypart/head/hed = victim.get_bodypart(BODY_ZONE_HEAD) - to_chat(victim, "You scratch at the ants on your scalp!.") + to_chat(victim, span_danger("You scratch at the ants on your scalp!.")) hed.receive_damage(1,0) if (9 to 29) //40% chance var/obj/item/bodypart/arm = victim.get_bodypart(pick(BODY_ZONE_L_ARM,BODY_ZONE_R_ARM)) - to_chat(victim, "You scratch at the ants on your arms!") + to_chat(victim, span_danger("You scratch at the ants on your arms!")) arm.receive_damage(3,0) if (30 to 49) //38% chance var/obj/item/bodypart/leg = victim.get_bodypart(pick(BODY_ZONE_L_LEG,BODY_ZONE_R_LEG)) - to_chat(victim, "You scratch at the ants on your leg!") + to_chat(victim, span_danger("You scratch at the ants on your leg!")) leg.receive_damage(3,0) if(50) // 2% chance - to_chat(victim, "You rub some ants away from your eyes!") + to_chat(victim, span_danger("You rub some ants away from your eyes!")) victim.blur_eyes(3) ants_remaining -= 5 // To balance out the blindness, it'll be a little shorter. ants_remaining-- @@ -1063,18 +1066,18 @@ /atom/movable/screen/alert/status_effect/ants name = "Ants!" - desc = "JESUS FUCKING CHRIST! CLICK TO GET THOSE THINGS OFF!" + desc = span_warning("JESUS FUCKING CHRIST! CLICK TO GET THOSE THINGS OFF!") icon_state = "antalert" /atom/movable/screen/alert/status_effect/ants/Click() var/mob/living/living = owner if(!istype(living) || !living.can_resist() || living != owner) return - to_chat(living, "You start to shake the ants off!") + to_chat(living, span_notice("You start to shake the ants off!")) if(!do_after(living, 2 SECONDS, target = living)) return for (var/datum/status_effect/ants/ant_covered in living.status_effects) - to_chat(living, "You manage to get some of the ants off!") + to_chat(living, span_notice("You manage to get some of the ants off!")) ant_covered.ants_remaining -= 10 // 5 Times more ants removed per second than just waiting in place /datum/status_effect/ghoul diff --git a/code/datums/wounds/slash.dm b/code/datums/wounds/slash.dm index 476df700298..86883dfec8a 100644 --- a/code/datums/wounds/slash.dm +++ b/code/datums/wounds/slash.dm @@ -186,12 +186,12 @@ user.ForceContractDisease(iter_disease) user.visible_message(span_notice("[user] begins licking the wounds on [victim]'s [limb.name]."), span_notice("You begin licking the wounds on [victim]'s [limb.name]..."), ignored_mobs=victim) - to_chat(victim, "[user] begins to lick the wounds on your [limb.name].[user] licks the wounds on your [limb.name]! minimum_flow) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index ce1e3c5a7c0..e3a1d5e5312 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -170,7 +170,7 @@ /atom/movable/proc/onZImpact(turf/impacted_turf, levels, message = TRUE) if(message) - visible_message("[src] crashes into [impacted_turf]!") + visible_message(span_danger("[src] crashes into [impacted_turf]!")) var/atom/highest = impacted_turf for(var/atom/hurt_atom as anything in impacted_turf.contents) if(!hurt_atom.density) @@ -253,20 +253,20 @@ destination = get_step_multiz(start, direction) if(!destination) if(z_move_flags & ZMOVE_FEEDBACK) - to_chat(rider || src, "There's nowhere to go in that direction!") + to_chat(rider || src, span_warning("There's nowhere to go in that direction!")) return FALSE if(z_move_flags & ZMOVE_FALL_CHECKS && (throwing || (movement_type & (FLYING|FLOATING)) || !has_gravity(start))) return FALSE if(z_move_flags & ZMOVE_CAN_FLY_CHECKS && !(movement_type & (FLYING|FLOATING)) && has_gravity(start)) if(z_move_flags & ZMOVE_FEEDBACK) if(rider) - to_chat(rider, "[src] is is not capable of flight.") + to_chat(rider, span_warning("[src] is is not capable of flight.")) else - to_chat(src, "You are not Superman.") + to_chat(src, span_warning("You are not Superman.")) return FALSE if(!(z_move_flags & ZMOVE_IGNORE_OBSTACLES) && !(start.zPassOut(src, direction, destination) && destination.zPassIn(src, direction, start))) if(z_move_flags & ZMOVE_FEEDBACK) - to_chat(rider || src, "You couldn't move there!") + to_chat(rider || src, span_warning("You couldn't move there!")) return FALSE return destination //used by some child types checks and zMove() diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index 56dd12588ff..06863d274b7 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -105,7 +105,7 @@ /obj/machinery/limbgrower/attackby(obj/item/user_item, mob/living/user, params) if (busy) - to_chat(user, "The Limb Grower is busy. Please wait for completion of previous operation.") + to_chat(user, span_warning("The Limb Grower is busy. Please wait for completion of previous operation.")) return if(istype(user_item, /obj/item/disk/design_disk/limbs)) @@ -137,7 +137,7 @@ return if (busy) - to_chat(usr, span_danger("The limb grower is busy. Please wait for completion of previous operation.")) + to_chat(usr, span_warning("The limb grower is busy. Please wait for completion of previous operation.")) return switch(action) @@ -284,6 +284,6 @@ var/datum/design/found_design = SSresearch.techweb_design_by_id(design_id) if((found_design.build_type & LIMBGROWER) && ("emagged" in found_design.category)) stored_research.add_design(found_design) - to_chat(user, span_warning("A warning flashes onto the screen, stating that safety overrides have been deactivated!")) + to_chat(user, span_warning("Safety overrides have been deactivated!")) obj_flags |= EMAGGED update_static_data(user) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 1bb28f6652c..d554796931a 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -351,7 +351,7 @@ if(occupant || helmet || suit || storage) return if(target == user) - user.visible_message(span_warning("[user] slips into [src] and closes the door behind [user.p_them()]!"), "You slip into [src]'s cramped space and shut its door.") + user.visible_message(span_warning("[user] slips into [src] and closes the door behind [user.p_them()]!"), span_notice("You slip into [src]'s cramped space and shut its door.")) else target.visible_message(span_warning("[user] pushes [target] into [src] and shuts its door!"), span_userdanger("[user] shoves you into [src] and shuts the door!")) close_machine(target) diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index b516900c31d..0faa180d74f 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -37,7 +37,7 @@ armed = TRUE icon_state = "uglymine" playsound(src, 'sound/machines/nuke/angry_beep.ogg', 40, FALSE, -2) - visible_message("\The [src] beeps softly, indicating it is now active.", vision_distance = COMBAT_MESSAGE_RANGE) + visible_message(span_danger("\The [src] beeps softly, indicating it is now active."), vision_distance = COMBAT_MESSAGE_RANGE) /obj/effect/mine/proc/on_entered(datum/source, atom/movable/AM) SIGNAL_HANDLER diff --git a/code/game/objects/items/choice_beacon.dm b/code/game/objects/items/choice_beacon.dm index 8b3a9095a0c..bb0a927a3c1 100644 --- a/code/game/objects/items/choice_beacon.dm +++ b/code/game/objects/items/choice_beacon.dm @@ -41,7 +41,7 @@ "style" = STYLE_BLUESPACE, "spawn" = choice, )) - var/msg = "After making your selection, you notice a strange target on the ground. It might be best to step back!" + var/msg = span_danger("After making your selection, you notice a strange target on the ground. It might be best to step back!") if(ishuman(M)) var/mob/living/carbon/human/H = M if(istype(H.ears, /obj/item/radio/headset)) diff --git a/code/game/objects/items/hand_items.dm b/code/game/objects/items/hand_items.dm index b59dbda8005..5fef308d3c9 100644 --- a/code/game/objects/items/hand_items.dm +++ b/code/game/objects/items/hand_items.dm @@ -523,7 +523,7 @@ living_target.face_atom(firer) living_target.Stun(rand(3 SECONDS, 8 SECONDS)) - living_target.visible_message("[living_target] [other_msg]", "Whoa! [self_msg]") + living_target.visible_message("[living_target] [other_msg]", span_userdanger("Whoa! [self_msg]")) /obj/projectile/kiss/on_hit(atom/target, blocked, pierce_hit) def_zone = BODY_ZONE_HEAD // let's keep it PG, people diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm index 6795c5e83b9..888df747047 100644 --- a/code/game/objects/items/melee/baton.dm +++ b/code/game/objects/items/melee/baton.dm @@ -157,8 +157,8 @@ /obj/item/melee/baton/proc/get_stun_description(mob/living/target, mob/living/user) . = list() - .["visible"] = "[user] knocks [target] down with [src]!" - .["local"] = "[user] knocks you down with [src]!" + .["visible"] = span_danger("[user] knocks [target] down with [src]!") + .["local"] = span_userdanger("[user] knocks you down with [src]!") return . @@ -175,8 +175,8 @@ /obj/item/melee/baton/proc/get_unga_dunga_cyborg_stun_description(mob/living/target, mob/living/user) . = list() - .["visible"] = "[user] tries to knock down [target] with [src], and predictably fails!" //look at this duuuuuude - .["local"] = "[target] tries to... knock you down with [src]?" //look at the top of his head! + .["visible"] = span_danger("[user] tries to knock down [target] with [src], and predictably fails!") //look at this duuuuuude + .["local"] = span_userdanger("[target] tries to... knock you down with [src]?") //look at the top of his head! return . diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 7e9517132cb..681a4e75151 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -49,7 +49,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CC = W if (get_amount() < 1 || CC.get_amount() < 5) - to_chat(user, "") + to_chat(user, span_notice("You turn the card over.")) if(!flipped) name = "Trading Card" desc = "It's the back of a trading card... no peeking!" @@ -381,11 +381,11 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices) for(var/template in cards) //Makes a new card based of the series of the pack. new /obj/item/tcgcard(get_turf(user), series, template) - to_chat(user, "Wow! Check out these cards!") + to_chat(user, span_notice("Wow! Check out these cards!")) new /obj/effect/decal/cleanable/wrapping(get_turf(user)) playsound(loc, 'sound/items/poster_ripped.ogg', 20, TRUE) if(prob(contains_coin)) - to_chat(user, "...and it came with a flipper, too!") + to_chat(user, span_notice("...and it came with a flipper, too!")) new /obj/item/coin/thunderdome(get_turf(user)) qdel(src) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index b0016ee18a3..0040b62595c 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1058,7 +1058,7 @@ /obj/item/toy/nuke/emag_act(mob/user) if (obj_flags & EMAGGED) return - to_chat(user, " You short-circuit \the [src].") + to_chat(user, span_warning("You short-circuit \the [src].")) obj_flags |= EMAGGED /* * Fake meteor @@ -1074,7 +1074,7 @@ /obj/item/toy/minimeteor/emag_act(mob/user) if (obj_flags & EMAGGED) return - to_chat(user, " You short-circuit whatever electronics exist inside \the [src], if there even are any.") + to_chat(user, span_warning("You short-circuit whatever electronics exist inside \the [src], if there even are any.")) obj_flags |= EMAGGED /obj/item/toy/minimeteor/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index ca9f326760d..819c722912c 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -553,10 +553,10 @@ LINEN BINS if(flags_1 & NODECONSTRUCT_1) return if(amount) - to_chat(user, "The [src] must be empty first!") + to_chat(user, span_warning("The [src] must be empty first!")) return if(I.use_tool(src, user, 5, volume=50)) - to_chat(user, "You disassemble the [src].") + to_chat(user, span_notice("You disassemble the [src].")) new /obj/item/stack/rods(loc, 2) qdel(src) diff --git a/code/game/objects/structures/crates_lockers/crates/secure.dm b/code/game/objects/structures/crates_lockers/crates/secure.dm index 79dede78da8..a2a256de2ab 100644 --- a/code/game/objects/structures/crates_lockers/crates/secure.dm +++ b/code/game/objects/structures/crates_lockers/crates/secure.dm @@ -108,11 +108,11 @@ privacy_lock = FALSE update_appearance() else if(!silent) - to_chat(user, span_notice("Bank account does not match with buyer!")) + to_chat(user, span_warning("Bank account does not match with buyer!")) else if(!silent) - to_chat(user, span_notice("No linked bank account detected!")) + to_chat(user, span_warning("No linked bank account detected!")) else if(!silent) - to_chat(user, span_notice("No ID detected!")) + to_chat(user, span_warning("No ID detected!")) else if(!silent) to_chat(user, span_warning("[src] is broken!")) else ..() diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index b66ed81839e..4eeab22191d 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -114,7 +114,7 @@ to_chat(user, span_notice("You move [unanchored_items_on_tile == 1 ? "[last_item_moved]" : "some things"] out of the way.")) if(unanchored_items_on_tile - CLEAR_TILE_MOVE_LIMIT > 0) - to_chat(user, "There's still too much stuff in the way!") + to_chat(user, span_warning("There's still too much stuff in the way!")) return FALSE return TRUE diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index f0342897005..65d658d592c 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -84,7 +84,7 @@ return can_refill = !can_refill - to_chat(user, "You [can_refill ? "en" : "dis"]able the shower's water recycler.") + to_chat(user, span_notice("You [can_refill ? "en" : "dis"]able the shower's water recycler.")) playsound(src, 'sound/machines/click.ogg', 20, TRUE) return TRUE diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm index 3b65c8d1027..205aa5ed917 100644 --- a/code/game/objects/structures/traps.dm +++ b/code/game/objects/structures/traps.dm @@ -171,7 +171,7 @@ var/turf/T = get_turf(src) if(!user || !user.transferItemToLoc(src, T))//visibly unequips return - to_chat(user, "You set up [src]. Examine while close to disarm it.") + to_chat(user, span_notice("You set up [src]. Examine while close to disarm it.")) stored_trap.forceMove(T)//moves trap to ground forceMove(stored_trap)//moves item into trap diff --git a/code/game/objects/structures/votingbox.dm b/code/game/objects/structures/votingbox.dm index abfa7c7ca7f..18b07dfcf8e 100644 --- a/code/game/objects/structures/votingbox.dm +++ b/code/game/objects/structures/votingbox.dm @@ -154,11 +154,11 @@ for(var/obj/item/paper/P in contents) options += P if(!length(options)) - to_chat(user,"Could not spawn you in as briefing officer as you are not a ghost!") + to_chat(usr, span_warning("Could not spawn you in as briefing officer as you are not a ghost!")) var/list/mob/dead/observer/candidates = poll_ghost_candidates("Do you wish to be considered for [ertemplate.polldesc]?", "deathsquad") var/teamSpawned = FALSE diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index e2d2fe71611..95e51fdeeba 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -171,7 +171,7 @@ /datum/antagonist/cult/on_removal() if(!silent) - owner.current.visible_message(span_deconversion_message("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.current.p_their()] old faith!"), null, null, null, owner.current) + owner.current.visible_message(span_deconversion_message(span_warning("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.current.p_their()] old faith!")), null, null, null, owner.current) to_chat(owner.current, span_userdanger("An unfamiliar white light flashes through your mind, cleansing the taint of the Geometer and all your memories as her servant.")) owner.current.log_message("has renounced the cult of Nar'Sie!", LOG_ATTACK, color="#960000") if(cult_team.blood_target && cult_team.blood_target_image && owner.current.client) diff --git a/code/modules/antagonists/disease/disease_mob.dm b/code/modules/antagonists/disease/disease_mob.dm index 12fed74ef94..f8344cfadcf 100644 --- a/code/modules/antagonists/disease/disease_mob.dm +++ b/code/modules/antagonists/disease/disease_mob.dm @@ -212,7 +212,7 @@ the new instance inside the host to be updated to the template's stats. possible_hosts.Cut(1, 2) if(del_on_fail) - to_chat(src, "No hosts were available for your disease to infect.") + to_chat(src, span_warning("No hosts were available for your disease to infect.")) qdel(src) return FALSE diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index 4351e740593..1a2e5770a0c 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -265,7 +265,7 @@ if(ishuman(owner.current)) owner.current.visible_message(span_deconversion_message("[owner.current] looks like [owner.current.p_theyve()] just remembered [owner.current.p_their()] real allegiance!"), null, null, null, owner.current) - to_chat(owner, "You are no longer a brainwashed revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you....") + to_chat(owner, "You are no longer a brainwashed revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you....") else if(issilicon(owner.current)) owner.current.visible_message(span_deconversion_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it."), null, null, null, owner.current) to_chat(owner, span_userdanger("The frame's firmware detects and deletes your neural reprogramming! You remember nothing but the name of the one who flashed you.")) @@ -276,9 +276,9 @@ if((ishuman(owner.current))) if(owner.current.stat != DEAD) owner.current.visible_message(span_deconversion_message("[owner.current] looks like [owner.current.p_theyve()] just remembered [owner.current.p_their()] real allegiance!"), null, null, null, owner.current) - to_chat(owner, "You have given up your cause of overthrowing the command staff. You are no longer a Head Revolutionary.") + to_chat(owner, "You have given up your cause of overthrowing the command staff. You are no longer a Head Revolutionary.") else - to_chat(owner, "The sweet release of death. You are no longer a Head Revolutionary.") + to_chat(owner, "The sweet release of death. You are no longer a Head Revolutionary.") else if(issilicon(owner.current)) owner.current.visible_message(span_deconversion_message("The frame beeps contentedly, suppressing the disloyal personality traits from the MMI before initalizing it."), null, null, null, owner.current) to_chat(owner, span_userdanger("The frame's firmware detects and suppresses your unwanted personality traits! You feel more content with the leadership around these parts.")) diff --git a/code/modules/assembly/doorcontrol.dm b/code/modules/assembly/doorcontrol.dm index 4cb1b0d8a69..36e1bfce801 100644 --- a/code/modules/assembly/doorcontrol.dm +++ b/code/modules/assembly/doorcontrol.dm @@ -194,7 +194,7 @@ if(!lift) addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 2 SECONDS) return - lift.visible_message("[src] clinks and whirrs into automated motion, locking controls.[src] clicks, ready to be manually operated again."} + return {""} /datum/asset/spritesheet/proc/icon_class_name(sprite_name) var/sprite = sprites[sprite_name] diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm index b68c841c9fa..145e391a50a 100644 --- a/code/modules/cargo/centcom_podlauncher.dm +++ b/code/modules/cargo/centcom_podlauncher.dm @@ -638,7 +638,7 @@ var/turf/target_turf = get_turf(target) setDropoff(target_turf) customDropoff = TRUE - to_chat(user, " You've selected [target_turf] at [COORD(target_turf)] as your dropoff location.") + to_chat(user, span_notice("You've selected [target_turf] at [COORD(target_turf)] as your dropoff location.")) /datum/centcom_podlauncher/proc/refreshView() switch(tabIndex) diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm index ffa300a5212..e9c745b2dd4 100644 --- a/code/modules/clothing/suits/cloaks.dm +++ b/code/modules/clothing/suits/cloaks.dm @@ -167,7 +167,7 @@ return user.mind?.get_skill_level(associated_skill_path) < SKILL_LEVEL_LEGENDARY /obj/item/clothing/neck/cloak/skill_reward/proc/unworthy_unequip(mob/user) - to_chat(user, "You feel completely and utterly unworthy to even touch \the [src].") + to_chat(user, span_warning("You feel completely and utterly unworthy to even touch \the [src].")) var/hand_index = user.get_held_index_of_item(src) if (hand_index) user.dropItemToGround(src, TRUE) diff --git a/code/modules/discord/accountlink.dm b/code/modules/discord/accountlink.dm index 3dae54d7742..2a672e60fe4 100644 --- a/code/modules/discord/accountlink.dm +++ b/code/modules/discord/accountlink.dm @@ -21,14 +21,14 @@ // Simple sanity check to prevent a user doing this too often var/cached_one_time_token = SSdiscord.reverify_cache[usr.ckey] if(cached_one_time_token && cached_one_time_token != "") - message = "You already generated your one time token, it is [cached_one_time_token], if you need a new one, you will have to wait until the round ends, or switch to another server, try verifying yourself in discord by using the command \" [prefix]verify [cached_one_time_token] \"" + message = "You already generated your one time token, it is [cached_one_time_token], if you need a new one, you will have to wait until the round ends, or switch to another server, try verifying yourself in discord by using the command \" [prefix]verify [cached_one_time_token] \"" else // Will generate one if an expired one doesn't exist already, otherwise will grab existing token var/one_time_token = SSdiscord.get_or_generate_one_time_token_for_ckey(ckey) SSdiscord.reverify_cache[usr.ckey] = one_time_token - message = "Your one time token is: [one_time_token], Assuming you have the required living minutes in game, you can now verify yourself in discord by using the command \" [prefix]verify [one_time_token] \"" + message = "Your one time token is: [one_time_token], Assuming you have the required living minutes in game, you can now verify yourself in discord by using the command \" [prefix]verify [one_time_token] \"" //Now give them a browse window so they can't miss whatever we told them var/datum/browser/window = new/datum/browser(usr, "discordverification", "Discord verification") diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 2f974c01b40..e42063e6694 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -762,7 +762,7 @@ /datum/plant_gene/trait/plant_laughter/proc/laughter(obj/item/our_plant, atom/target) SIGNAL_HANDLER - our_plant.audible_message("[our_plant] lets out burst of laughter.") + our_plant.audible_message(span_notice("[our_plant] lets out burst of laughter.")) playsound(our_plant, pick(sounds), 100, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) /** diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index 9d957a753f0..22866faaaec 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -42,7 +42,7 @@ if(C.mind && C.mind.has_antag_datum(/datum/antagonist/changeling) && !no_id_transfer) //congrats, you're trapped in a body you don't control if(brainmob && !(C.stat == DEAD || (HAS_TRAIT(C, TRAIT_DEATHCOMA)))) - to_chat(brainmob, "You can't feel your body! You're still just a brain!") + to_chat(brainmob, span_danger("You can't feel your body! You're still just a brain!")) forceMove(C) C.update_hair() return diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm index 425b640ccee..a44df90545a 100644 --- a/code/modules/mob/living/living_movement.dm +++ b/code/modules/mob/living/living_movement.dm @@ -75,7 +75,7 @@ /mob/living/can_z_move(direction, turf/start, turf/destination, z_move_flags = ZMOVE_FLIGHT_FLAGS, mob/living/rider) if(z_move_flags & ZMOVE_INCAPACITATED_CHECKS && incapacitated()) if(z_move_flags & ZMOVE_FEEDBACK) - to_chat(rider || src, "[rider ? src : "You"] can't do that right now!") + to_chat(rider || src, span_warning("[rider ? src : "You"] can't do that right now!")) return FALSE if(!buckled || !(z_move_flags & ZMOVE_ALLOW_BUCKLED)) return ..() @@ -88,7 +88,7 @@ if(!(z_move_flags & ZMOVE_CAN_FLY_CHECKS) && !buckled.anchored) return buckled.can_z_move(direction, start, destination, z_move_flags, src) if(z_move_flags & ZMOVE_FEEDBACK) - to_chat(src, "Unbuckle from [buckled] first.") + to_chat(src, span_warning("Unbuckle from [buckled] first.")) return FALSE /mob/set_currently_z_moving(value) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm index 96f6e586a20..089a578500f 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm @@ -341,7 +341,7 @@ While using this makes the system rely on OnFire, it still gives options for tim E.revive(full_heal = TRUE, admin_revive = TRUE) user.visible_message(span_notice("[user] stabs [E] with [src], reviving it.")) E.playsound_local(get_turf(E), 'sound/effects/magic.ogg', 40, 0) - to_chat(E, "You have been revived by [user]. While you can't speak to them, you owe [user] a great debt. Assist [user.p_them()] in achieving [user.p_their()] goals, regardless of risk.You have been revived by [user]. While you can't speak to them, you owe [user] a great debt. Assist [user.p_them()] in achieving [user.p_their()] goals, regardless of risk.") to_chat(E, "Note that you now share the loyalties of [user]. You are expected not to intentionally sabotage their faction unless commanded to!") E.maxHealth = E.maxHealth * 0.4 E.health = E.maxHealth diff --git a/code/modules/mob/living/simple_animal/hostile/ooze.dm b/code/modules/mob/living/simple_animal/hostile/ooze.dm index a8716071649..1b6c1bfd6a8 100644 --- a/code/modules/mob/living/simple_animal/hostile/ooze.dm +++ b/code/modules/mob/living/simple_animal/hostile/ooze.dm @@ -213,7 +213,7 @@ if(vored_mob) to_chat(src, span_warning("You are already consuming another creature!")) return FALSE - owner.visible_message("[ooze] launches a mending globule!", span_notice("You launch a mending globule.")) + ooze.visible_message(span_nicegreen("[ooze] launches a mending globule!"), span_notice("You launch a mending globule.")) var/modifiers = params2list(params) var/obj/projectile/globule/globule = new (ooze.loc) globule.preparePixelProjectile(target, ooze, modifiers) @@ -419,7 +419,7 @@ if(!iscarbon(ooze.pulling)) to_chat(src, span_warning("You need to be pulling an intelligent enough creature to assist it with a cocoon!")) return FALSE - owner.visible_message("[owner] has put [target] into a gel cocoon!", span_notice("You put [target] into a gel cocoon.")) + owner.visible_message(span_nicegreen("[owner] has put [target] into a gel cocoon!"), span_notice("You put [target] into a gel cocoon.")) StartCooldown() /obj/structure/gel_cocoon @@ -473,7 +473,7 @@ inhabitant.forceMove(get_turf(src)) playsound(get_turf(inhabitant), 'sound/effects/splat.ogg', 50, TRUE) inhabitant.Paralyze(10) - inhabitant.visible_message("[src] eats [eaten_atom]!", span_notice("You eat [eaten_atom].")) + visible_message(span_warning("[src] eats [eaten_atom]!"), span_notice("You eat [eaten_atom].")) if(is_type_in_list(eaten_atom, funny_items)) eaten_atom.forceMove(src) prank_pouch += eaten_atom diff --git a/code/modules/mob/living/simple_animal/hostile/vatbeast.dm b/code/modules/mob/living/simple_animal/hostile/vatbeast.dm index 79b3b9ed172..3d866e60081 100644 --- a/code/modules/mob/living/simple_animal/hostile/vatbeast.dm +++ b/code/modules/mob/living/simple_animal/hostile/vatbeast.dm @@ -104,7 +104,7 @@ to_chat(caller, span_notice("This ability is still on cooldown.")) return - beast_owner.visible_message("[beast_owner] slaps [living_target] with its tentacle!", span_notice("You slap [living_target] with your tentacle.")) playsound(beast_owner, 'sound/effects/assslap.ogg', 90) var/atom/throw_target = get_edge_target_turf(target, beast_owner.dir) living_target.throw_at(throw_target, 6, 4, beast_owner) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 678a6a07389..ef38f2fbd8f 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -503,14 +503,14 @@ var/ventcrawling_flag = HAS_TRAIT(src, TRAIT_MOVE_VENTCRAWLING) ? ZMOVE_VENTCRAWLING : 0 if(!above_turf) - to_chat(src, "There's nowhere to go in that direction!") + to_chat(src, span_warning("There's nowhere to go in that direction!")) return if(can_z_move(DOWN, above_turf, current_turf, ZMOVE_FALL_FLAGS|ventcrawling_flag)) //Will we fall down if we go up? if(buckled) - to_chat(src, "[buckled] is is not capable of flight.") + to_chat(src, span_warning("[buckled] is is not capable of flight.")) else - to_chat(src, "You are not Superman.") + to_chat(src, span_warning("You are not Superman.")) return if(zMove(UP, z_move_flags = ZMOVE_FLIGHT_FLAGS|ZMOVE_FEEDBACK|ventcrawling_flag)) diff --git a/code/modules/photography/photos/frame.dm b/code/modules/photography/photos/frame.dm index 8e5bc00a21b..819c1c675d1 100644 --- a/code/modules/photography/photos/frame.dm +++ b/code/modules/photography/photos/frame.dm @@ -19,7 +19,7 @@ displayed = I update_appearance() else - to_chat(user, "\The [src] already contains a photo.") + to_chat(user, span_warning("\The [src] already contains a photo.")) ..() //ATTACK HAND IGNORING PARENT RETURN VALUE @@ -139,7 +139,7 @@ framed = P update_appearance() else - to_chat(user, "\The [src] already contains a photo.") + to_chat(user, span_warning("\The [src] already contains a photo.")) ..() diff --git a/code/modules/plumbing/plumbers/_plumb_machinery.dm b/code/modules/plumbing/plumbers/_plumb_machinery.dm index cf1d4ff2ccb..b583bda128d 100644 --- a/code/modules/plumbing/plumbers/_plumb_machinery.dm +++ b/code/modules/plumbing/plumbers/_plumb_machinery.dm @@ -45,12 +45,12 @@ /obj/machinery/plumbing/welder_act(mob/living/user, obj/item/I) . = ..() if(anchored) - to_chat(user, "The [name] needs to be unbolted to do that!You start slicing the [name] apart.You slice the [name] apart.Without drawing the bow, the arrow uselessly falls to the ground.") + to_chat(user, span_warning("Without drawing the bow, the arrow uselessly falls to the ground.")) drop_arrow() update_appearance() return diff --git a/code/modules/reagents/chemistry/equilibrium.dm b/code/modules/reagents/chemistry/equilibrium.dm index e036b5a2a27..5ebac827b23 100644 --- a/code/modules/reagents/chemistry/equilibrium.dm +++ b/code/modules/reagents/chemistry/equilibrium.dm @@ -373,9 +373,9 @@ #ifdef REAGENTS_TESTING //Kept in so that people who want to write fermireactions can contact me with this log so I can help them if(GLOB.Debug2) //I want my spans for my sanity - message_admins("Reaction step active for:[reaction.type]") - message_admins("|Reaction conditions| Temp: [holder.chem_temp], pH: [holder.ph], reactions: [length(holder.reaction_list)], awaiting reactions: [length(holder.failed_but_capable_reactions)], no. reagents:[length(holder.reagent_list)], no. prev reagents: [length(holder.previous_reagent_list)]") - message_admins("Reaction vars: PreReacted:[reacted_vol] of [step_target_vol] of total [target_vol]. delta_t [delta_t], multiplier [multiplier], delta_chem_factor [delta_chem_factor] Pfactor [product_ratio], purity of [purity] from a delta_ph of [delta_ph]. DeltaTime: [delta_time]") + message_admins("Reaction step active for:[reaction.type]") + message_admins("|Reaction conditions| Temp: [holder.chem_temp], pH: [holder.ph], reactions: [length(holder.reaction_list)], awaiting reactions: [length(holder.failed_but_capable_reactions)], no. reagents:[length(holder.reagent_list)], no. prev reagents: [length(holder.previous_reagent_list)]") + message_admins("Reaction vars: PreReacted:[reacted_vol] of [step_target_vol] of total [target_vol]. delta_t [delta_t], multiplier [multiplier], delta_chem_factor [delta_chem_factor] Pfactor [product_ratio], purity of [purity] from a delta_ph of [delta_ph]. DeltaTime: [delta_time]") #endif //Apply thermal output of reaction to beaker diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index cbea8bfa8b6..0f96f89b080 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -339,7 +339,7 @@ var/reagent_id = GLOB.name2reagent[translate_legacy_chem_id(reagent)] if(!dispensable_reagents.Find(reagent_id)) visible_message(span_warning("[src] buzzes."), span_hear("You hear a faint buzz.")) - to_chat(usr, "[src] cannot find [reagent]!") + to_chat(usr, span_warning("[src] cannot find [reagent]!")) playsound(src, 'sound/machines/buzz-two.ogg', 50, TRUE) return saved_recipes[name] = recording_recipe diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm index 5fd55147a6c..c3d88ea84d0 100644 --- a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm @@ -680,7 +680,7 @@ Basically, we fill the time between now and 2s from now with hands based off the //these last so instert doesn't call them RegisterSignal(carbon_mob, COMSIG_CARBON_GAIN_ORGAN, .proc/on_gained_organ) RegisterSignal(carbon_mob, COMSIG_CARBON_LOSE_ORGAN, .proc/on_removed_organ) - to_chat(owner, "You feel your heart suddenly stop beating on it's own - you'll have to manually beat it!") + to_chat(owner, span_userdanger("You feel your heart suddenly stop beating on it's own - you'll have to manually beat it!")) ..() ///Intercepts the new heart and creates a new cursed heart - putting the old inside of it @@ -718,7 +718,7 @@ Basically, we fill the time between now and 2s from now with hands based off the original_heart.organ_flags &= ~ORGAN_FROZEN //enable decay again original_heart.Insert(carbon_mob, special = TRUE) qdel(manual_heart) - to_chat(owner, "You feel your heart start beating normally again!") + to_chat(owner, span_userdanger("You feel your heart start beating normally again!")) ..() /datum/reagent/inverse/antihol @@ -755,14 +755,14 @@ Basically, we fill the time between now and 2s from now with hands based off the return ..() if(DT_PROB(100*(1-creation_purity), delta_time)) owner.become_blind(IMPURE_OCULINE) - to_chat(owner, "You suddenly develop a pounding headache as your vision fluxuates.") + to_chat(owner, span_danger("You suddenly develop a pounding headache as your vision fluxuates.")) headache = TRUE ..() /datum/reagent/inverse/oculine/on_mob_end_metabolize(mob/living/owner) owner.cure_blind(IMPURE_OCULINE) if(headache) - to_chat(owner, "Your headache clears up!") + to_chat(owner, span_notice("Your headache clears up!")) ..() /datum/reagent/impurity/inacusiate @@ -781,12 +781,12 @@ Basically, we fill the time between now and 2s from now with hands based off the /datum/reagent/impurity/inacusiate/on_mob_metabolize(mob/living/owner, delta_time, times_fired) randomSpan = pick(list("clown", "small", "big", "hypnophrase", "alien", "cult", "alert", "danger", "emote", "yell", "brass", "sans", "papyrus", "robot", "his_grace", "phobia")) RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/owner_hear) - to_chat(owner, "Your hearing seems to be a bit off...!") + to_chat(owner, span_warning("Your hearing seems to be a bit off!")) ..() /datum/reagent/impurity/inacusiate/on_mob_end_metabolize(mob/living/owner) UnregisterSignal(owner, COMSIG_MOVABLE_HEAR) - to_chat(owner, "You start hearing things normally again.") + to_chat(owner, span_notice("You start hearing things normally again.")) ..() /datum/reagent/impurity/inacusiate/proc/owner_hear(datum/source, list/hearing_args) diff --git a/code/modules/recycling/conveyor.dm b/code/modules/recycling/conveyor.dm index b7052a97571..1e00bdda307 100644 --- a/code/modules/recycling/conveyor.dm +++ b/code/modules/recycling/conveyor.dm @@ -404,7 +404,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) found = 1 break if(!found) - to_chat(user, "[icon2html(src, user)]The conveyor switch did not detect any linked conveyor belts in range.") + to_chat(user, "[icon2html(src, user)]The conveyor switch did not detect any linked conveyor belts in range.") return var/obj/machinery/conveyor_switch/NC = new/obj/machinery/conveyor_switch(A, id) transfer_fingerprints_to(NC) diff --git a/code/modules/religion/religion_sects.dm b/code/modules/religion/religion_sects.dm index f241c5c4e45..db920c9026e 100644 --- a/code/modules/religion/religion_sects.dm +++ b/code/modules/religion/religion_sects.dm @@ -55,8 +55,8 @@ /// Activates once selected and on newjoins, oriented around people who become holy. /datum/religion_sect/proc/on_conversion(mob/living/chap) SHOULD_CALL_PARENT(TRUE) - to_chat(chap, "\"[quote]\"[desc]\"[quote]\"") + to_chat(chap, "[desc]") /// Returns TRUE if the item can be sacrificed. Can be modified to fit item being tested as well as person offering. Returning TRUE will stop the attackby sequence and proceed to on_sacrifice. /datum/religion_sect/proc/can_sacrifice(obj/item/I, mob/living/chap) diff --git a/code/modules/religion/religion_structures.dm b/code/modules/religion/religion_structures.dm index ab17094cc71..62c130ab18f 100644 --- a/code/modules/religion/religion_structures.dm +++ b/code/modules/religion/religion_structures.dm @@ -39,7 +39,7 @@ if(pushed_mob.buckled) to_chat(user, span_warning("[pushed_mob] is buckled to [pushed_mob.buckled]!")) return ..() - to_chat(user,"") + to_chat(user, span_notice("You take a photo with [target]!")) + to_chat(target, span_notice("[user] takes a photo with you!")) + to_chat(target, span_boldnotice("You'll remember this moment forever!")) used = TRUE target.AddComponent(/datum/component/dejavu, 2) diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm index efe03c7ef51..40525af47c6 100644 --- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm +++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm @@ -159,7 +159,7 @@ Regenerative extracts: effect_desc = "Fully heals the target and stops time." /obj/item/slimecross/regenerative/sepia/core_effect_before(mob/living/target, mob/user) - to_chat(target, "You try to forget how you feel.") + to_chat(target, span_notice("You try to forget how you feel.")) target.AddComponent(/datum/component/dejavu) /obj/item/slimecross/regenerative/cerulean diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm index 4e458b56a59..a6c07c4a4ac 100644 --- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm @@ -578,4 +578,4 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) Choose a room, and enter the sphere
Lay your head to rest, it soon becomes clear
There's always more room around every bend
- Not all that's countable has an end..."} + Not all that's countable has an end..."} diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index ecfb283b5e4..206e8d90f33 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -200,10 +200,10 @@ if(!user.CanReach(src)) return if(!user?.mind?.get_hijack_speed()) - to_chat(user, "You manage to open a user-mode shell on [src], and hundreds of lines of debugging output fly through your vision. It is probably best to leave this alone.The flight plans for the shuttle haven't been loaded yet, you can't hack this right now.Unable to find an unobstructed space, you find yourself ripped back to where you started.") + to_chat(target, span_danger("Unable to find an unobstructed space, you find yourself ripped back to where you started.")) exit_point_list.Cut() holder.forceMove(exit_point) diff --git a/code/modules/spells/spell_types/mime.dm b/code/modules/spells/spell_types/mime.dm index 77c7b6d5fa2..a889693f58b 100644 --- a/code/modules/spells/spell_types/mime.dm +++ b/code/modules/spells/spell_types/mime.dm @@ -183,7 +183,7 @@ clothes_req = FALSE antimagic_allowed = TRUE invocation_type = INVOCATION_EMOTE - invocation_emote_self = "You fire your finger gun!" + invocation_emote_self = span_danger("You fire your finger gun!") range = 20 projectile_type = /obj/projectile/bullet/mime projectile_amount = 3 diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm index f148b74a509..572a89aa338 100755 --- a/code/modules/surgery/organs/liver.dm +++ b/code/modules/surgery/organs/liver.dm @@ -115,20 +115,20 @@ switch(failure_time/LIVER_FAILURE_STAGE_SECONDS) if(1) - to_chat(owner,"You feel stabbing pain in your abdomen!") + to_chat(owner, span_userdanger("You feel stabbing pain in your abdomen!")) if(2) - to_chat(owner,"You feel a burning sensation in your gut!") + to_chat(owner, span_userdanger("You feel a burning sensation in your gut!")) owner.vomit() if(3) - to_chat(owner,"You feel painful acid in your throat!") + to_chat(owner, span_userdanger("You feel painful acid in your throat!")) owner.vomit(blood = TRUE) if(4) - to_chat(owner,"Overwhelming pain knocks you out!") + to_chat(owner, span_userdanger("Overwhelming pain knocks you out!")) owner.vomit(blood = TRUE, distance = rand(1,2)) owner.emote("Scream") owner.AdjustUnconscious(2.5 SECONDS) if(5) - to_chat(owner,"You feel as if your guts are about to melt!") + to_chat(owner, span_userdanger("You feel as if your guts are about to melt!")) owner.vomit(blood = TRUE,distance = rand(1,3)) owner.emote("Scream") owner.AdjustUnconscious(5 SECONDS) diff --git a/code/modules/surgery/repair_puncture.dm b/code/modules/surgery/repair_puncture.dm index 602daba9957..de7248b5d41 100644 --- a/code/modules/surgery/repair_puncture.dm +++ b/code/modules/surgery/repair_puncture.dm @@ -114,7 +114,7 @@ pierce_wound.blood_flow -= 0.5 if(pierce_wound.blood_flow > 0) surgery.status = REALIGN_INNARDS - to_chat(user, span_notice("There still seems to be misaligned blood vessels to finish...")) + to_chat(user, span_notice("There still seems to be misaligned blood vessels to finish...")) else to_chat(user, span_green("You've repaired all the internal damage in [target]'s [parse_zone(target_zone)]!")) return ..() diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm index 0df887e66f6..b01d17d3803 100644 --- a/code/modules/vehicles/mecha/_mecha.dm +++ b/code/modules/vehicles/mecha/_mecha.dm @@ -291,7 +291,7 @@ for(var/occupant in occupants) var/mob/mob_occupant = occupant SEND_SOUND(mob_occupant, sound('sound/items/timer.ogg', volume=50)) - to_chat(mob_occupant, "Equipment control unit has been rebooted successfully.") + to_chat(mob_occupant, span_notice("Equipment control unit has been rebooted successfully.")) mob_occupant.update_mouse_pointer() /obj/vehicle/sealed/mecha/CheckParts(list/parts_list) diff --git a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm index 7747e20d35b..9566908301b 100644 --- a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm +++ b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm @@ -84,7 +84,7 @@ if(chassis.is_currently_ejecting) return FALSE if(chassis.equipment_disabled) - to_chat(chassis.occupants, "Error -- Equipment control unit is unresponsive.") + to_chat(chassis.occupants, span_warning("Error -- Equipment control unit is unresponsive.")) return FALSE if(TIMER_COOLDOWN_CHECK(chassis, COOLDOWN_MECHA_EQUIPMENT)) return FALSE diff --git a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm index 9fd910ce9bd..ae1ef8fa170 100644 --- a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm @@ -326,13 +326,13 @@ return analyze_reagents(target, source) //we're in syringe mode so lets do syringe stuff if(!LAZYLEN(syringes)) - to_chat(source, "[icon2html(src, source)]No syringes loaded.") + to_chat(source, "[icon2html(src, source)]No syringes loaded.") return if(reagents.total_volume<=0) - to_chat(source, "[icon2html(src, source)]No available reagents to load syringe with.") + to_chat(source, "[icon2html(src, source)]No available reagents to load syringe with.") return if(HAS_TRAIT(source, TRAIT_PACIFISM)) - to_chat(source, "The [src] might be lethally chambered! You don't want to risk harming anyone...") + to_chat(source, span_alert("The [src] might be lethally chambered! You don't want to risk harming anyone...")) return var/obj/item/ammo_casing/syringegun/chambered = new /obj/item/ammo_casing/syringegun(src) log_message("Fired [chambered] from [src] by [source], targeting [target].", LOG_MECHA) diff --git a/code/modules/vehicles/mecha/mecha_defense.dm b/code/modules/vehicles/mecha/mecha_defense.dm index 00295e44cde..24f3084a296 100644 --- a/code/modules/vehicles/mecha/mecha_defense.dm +++ b/code/modules/vehicles/mecha/mecha_defense.dm @@ -171,7 +171,7 @@ var/mob/living/occupant = occus occupant.update_mouse_pointer() if(!equipment_disabled && LAZYLEN(occupants)) //prevent spamming this message with back-to-back EMPs - to_chat(occupants, "Error -- Connection to equipment control unit has been lost.") + to_chat(occupants, span_warning("Error -- Connection to equipment control unit has been lost.")) addtimer(CALLBACK(src, /obj/vehicle/sealed/mecha/proc/restore_equipment), 3 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) equipment_disabled = 1