From f6e0129f79191ef7b7e883e547082a6e40f3de9c Mon Sep 17 00:00:00 2001 From: harryob <55142896+harryob@users.noreply.github.com> Date: Thu, 23 Jan 2025 12:30:51 +0000 Subject: [PATCH] fuck off backslashes --- code/_onclick/human.dm | 6 +- code/_onclick/item_attack.dm | 4 +- code/_onclick/xeno.dm | 4 +- code/datums/ammo/bullet/bullet.dm | 2 +- .../elements/bullet_trait/incendiary.dm | 4 +- code/game/machinery/OpTable.dm | 2 +- code/game/machinery/colony_floodlights.dm | 20 +- code/game/machinery/doors/airlock.dm | 12 +- code/game/machinery/doors/firedoor.dm | 28 +- code/game/machinery/doors/poddoor/poddoor.dm | 4 +- code/game/machinery/fusion_engine.dm | 2 +- code/game/machinery/iv_drip.dm | 4 +- code/game/machinery/kitchen/microwave.dm | 44 +- code/game/machinery/kitchen/processor.dm | 8 +- code/game/machinery/kitchen/smartfridge.dm | 6 +- code/game/machinery/pipe/construction.dm | 6 +- code/game/machinery/pipe/pipe_dispenser.dm | 12 +- code/game/machinery/vending/cm_vending.dm | 18 +- .../machinery/vending/vendor_types/medical.dm | 14 +- code/game/objects/effects/acid_hole.dm | 4 +- .../objects/effects/effect_system/foam.dm | 2 +- .../objects/effects/effect_system/smoke.dm | 6 +- code/game/objects/items/bodybag.dm | 2 +- code/game/objects/items/books/book.dm | 2 +- .../objects/items/circuitboards/computer.dm | 2 +- code/game/objects/items/cosmetics.dm | 2 +- code/game/objects/items/devices/coins.dm | 2 +- .../objects/items/devices/defibrillator.dm | 4 +- code/game/objects/items/devices/flashlight.dm | 8 +- .../items/explosives/grenades/grenade.dm | 2 +- code/game/objects/items/explosives/mine.dm | 18 +- code/game/objects/items/explosives/plastic.dm | 6 +- .../objects/items/frames/light_fixtures.dm | 2 +- code/game/objects/items/fulton.dm | 4 +- code/game/objects/items/misc.dm | 4 +- .../items/reagent_containers/blood_pack.dm | 4 +- .../items/reagent_containers/food/snacks.dm | 18 +- .../objects/items/reagent_containers/glass.dm | 4 +- .../items/reagent_containers/hypospray.dm | 2 +- .../items/reagent_containers/syringes.dm | 2 +- code/game/objects/items/stacks/cable_coil.dm | 2 +- code/game/objects/items/stacks/nanopaste.dm | 2 +- code/game/objects/items/stacks/stack.dm | 2 +- code/game/objects/items/storage/backpack.dm | 2 +- code/game/objects/items/storage/storage.dm | 4 +- .../objects/items/tools/experimental_tools.dm | 8 +- .../objects/items/tools/maintenance_tools.dm | 16 +- code/game/objects/items/tools/misc_tools.dm | 4 +- code/game/objects/items/toys/toys.dm | 4 +- code/game/objects/items/weapons/blades.dm | 2 +- .../objects/items/weapons/swords_axes_etc.dm | 12 +- code/game/objects/items/weapons/weaponry.dm | 2 +- code/game/objects/objs.dm | 24 +- .../structures/barricade/deployable.dm | 2 +- .../objects/structures/barricade/sandbags.dm | 6 +- code/game/objects/structures/bookcase.dm | 2 +- .../objects/structures/cargo_container.dm | 10 +- .../structures/crates_lockers/largecrate.dm | 4 +- code/game/objects/structures/curtains.dm | 2 +- code/game/objects/structures/grille.dm | 14 +- code/game/objects/structures/hybrisa_props.dm | 4 +- code/game/objects/structures/morgue.dm | 4 +- .../objects/structures/pipes/vents/vents.dm | 6 +- code/game/objects/structures/platforms.dm | 8 +- code/game/objects/structures/props.dm | 8 +- .../objects/structures/reagent_dispensers.dm | 8 +- code/game/objects/structures/sink.dm | 8 +- .../stool_bed_chair_nest/janicart.dm | 4 +- .../stool_bed_chair_nest/xeno_nest.dm | 14 +- code/game/objects/structures/window_frame.dm | 4 +- code/game/supplyshuttle.dm | 2 +- code/game/turfs/light.dm | 4 +- code/game/turfs/walls/wall_types.dm | 8 +- code/modules/cm_aliens/Ovipositor.dm | 6 +- code/modules/cm_aliens/XenoStructures.dm | 10 +- code/modules/cm_aliens/structures/egg.dm | 4 +- .../structures/special/egg_morpher.dm | 4 +- .../structures/special/recovery_node.dm | 2 +- code/modules/cm_aliens/structures/trap.dm | 6 +- code/modules/cm_aliens/structures/tunnel.dm | 4 +- code/modules/cm_aliens/weeds.dm | 2 +- code/modules/cm_marines/dropship_equipment.dm | 4 +- .../cm_marines/equipment/mortar/mortars.dm | 12 +- code/modules/cm_marines/m2c.dm | 8 +- code/modules/cm_marines/smartgun_mount.dm | 4 +- code/modules/cm_preds/yaut_weapons.dm | 6 +- code/modules/cm_tech/resources/resource.dm | 8 +- .../desert_dam/motion_sensor/sensortower.dm | 6 +- code/modules/hydroponics/seed_datums.dm | 2 +- code/modules/hydroponics/vines.dm | 18 +- code/modules/mob/living/carbon/carbon.dm | 22 +- code/modules/mob/living/carbon/human/human.dm | 20 +- .../living/carbon/human/human_abilities.dm | 2 +- .../living/carbon/human/human_attackhand.dm | 12 +- .../life/handle_regular_status_updates.dm | 2 +- .../carbon/human/powers/human_powers.dm | 2 +- .../living/carbon/human/species/species.dm | 14 +- .../mob/living/carbon/xenomorph/Embryo.dm | 8 +- .../mob/living/carbon/xenomorph/Evolution.dm | 10 +- .../living/carbon/xenomorph/Facehuggers.dm | 2 +- .../mob/living/carbon/xenomorph/Powers.dm | 6 +- .../living/carbon/xenomorph/XenoAttacks.dm | 28 +- .../mob/living/carbon/xenomorph/XenoProcs.dm | 2 +- .../mob/living/carbon/xenomorph/Xenomorph.dm | 6 +- .../abilities/ability_helper_procs.dm | 4 +- .../abilities/burrower/burrower_powers.dm | 4 +- .../abilities/defender/defender_powers.dm | 4 +- .../xenomorph/abilities/general_abilities.dm | 4 +- .../xenomorph/abilities/general_powers.dm | 10 +- .../abilities/lurker/lurker_powers.dm | 6 +- .../abilities/praetorian/praetorian_powers.dm | 6 +- .../abilities/predalien/predalien_powers.dm | 2 +- .../xenomorph/abilities/queen/queen_powers.dm | 6 +- .../abilities/runner/runner_powers.dm | 4 +- .../abilities/sentinel/sentinel_powers.dm | 4 +- .../abilities/warrior/warrior_powers.dm | 2 +- .../living/carbon/xenomorph/attack_alien.dm | 122 +++--- .../living/carbon/xenomorph/castes/Carrier.dm | 2 +- .../living/carbon/xenomorph/castes/Crusher.dm | 2 +- .../living/carbon/xenomorph/castes/Queen.dm | 4 +- .../living/carbon/xenomorph/castes/Warrior.dm | 10 +- .../living/carbon/xenomorph/damage_procs.dm | 2 +- .../mob/living/carbon/xenomorph/egg_item.dm | 2 +- .../strains/castes/drone/gardener.dm | 8 +- .../simple_animal/friendly/farm_animals.dm | 2 +- .../hostile/retaliate/giant_lizard.dm | 4 +- code/modules/mob/mob_grab.dm | 4 +- code/modules/organs/limb_objects.dm | 8 +- code/modules/organs/limbs.dm | 16 +- code/modules/paperwork/paper.dm | 10 +- code/modules/paperwork/paper_bundle.dm | 4 +- code/modules/paperwork/photography.dm | 2 +- code/modules/power/apc.dm | 6 +- code/modules/power/breaker_box.dm | 4 +- code/modules/power/lighting.dm | 10 +- code/modules/power/smes.dm | 8 +- code/modules/projectiles/guns/shotguns.dm | 10 +- code/modules/projectiles/projectile.dm | 2 +- code/modules/recycling/sortingmachinery.dm | 28 +- code/modules/surgery/chestburster.dm | 2 +- code/modules/surgery/headreattach.dm | 24 +- code/modules/surgery/organs_internal.dm | 386 ------------------ code/modules/tents/deployed_tents.dm | 2 +- code/modules/tents/folded_tents.dm | 2 +- .../multitile/multitile_interaction.dm | 4 +- code/modules/vehicles/powerloader.dm | 2 +- 146 files changed, 555 insertions(+), 941 deletions(-) diff --git a/code/_onclick/human.dm b/code/_onclick/human.dm index 2a8cfb88bd99..1091eab4b5ba 100644 --- a/code/_onclick/human.dm +++ b/code/_onclick/human.dm @@ -112,7 +112,7 @@ if(user.get_active_hand()) to_chat(user, SPAN_WARNING("You can't unstrap \the [back_item] from [xeno] with your hands full.")) return - user.visible_message(SPAN_NOTICE("\The [user] starts unstrapping \the [back_item] from [xeno]"), \ + user.visible_message(SPAN_NOTICE("\The [user] starts unstrapping \the [back_item] from [xeno]"), SPAN_NOTICE("You start unstrapping \the [back_item] from [xeno]."), null, 5, CHAT_TYPE_FLUFF_ACTION) if(!do_after(user, HUMAN_STRIP_DELAY * user.get_skill_duration_multiplier(SKILL_CQC), INTERRUPT_ALL, BUSY_ICON_GENERIC, xeno, INTERRUPT_MOVED, BUSY_ICON_GENERIC)) to_chat(user, SPAN_WARNING("You were interrupted!")) @@ -142,13 +142,13 @@ var/mob/living/carbon/human/target = dropping - user.visible_message(SPAN_WARNING("[src] starts loading [target] onto their back."),\ + user.visible_message(SPAN_WARNING("[src] starts loading [target] onto their back."), SPAN_WARNING("You start loading [target] onto your back.")) if(!do_after(src, carry_delay * get_skill_duration_multiplier(SKILL_FIREMAN), INTERRUPT_ALL, BUSY_ICON_HOSTILE, pulling, INTERRUPT_MOVED, BUSY_ICON_HOSTILE)) return - user.visible_message(SPAN_WARNING("[src] loads [target] onto their back."),\ + user.visible_message(SPAN_WARNING("[src] loads [target] onto their back."), SPAN_WARNING("You load [target] onto your back.")) if(pulling != dropping || !dropping || QDELETED(dropping)) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 818937ff16a0..1631bc7bd12e 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -72,7 +72,7 @@ if (user.a_intent == INTENT_HELP && ((user.client?.prefs && user.client?.prefs?.toggle_prefs & TOGGLE_HELP_INTENT_SAFETY) || (user.mob_flags & SURGERY_MODE_ON))) playsound(loc, 'sound/effects/pop.ogg', 25, 1) - user.visible_message(SPAN_NOTICE("[M] has been poked with [src][showname]"),\ + user.visible_message(SPAN_NOTICE("[M] has been poked with [src][showname]"), SPAN_NOTICE("You poke [M == user ? "yourself":M] with [src]."), null, 4) return FALSE @@ -93,7 +93,7 @@ var/used_verb = "attacked" if(LAZYLEN(attack_verb)) used_verb = pick(attack_verb) - user.visible_message(SPAN_DANGER("[M] has been [used_verb] with [src][showname]."), \ + user.visible_message(SPAN_DANGER("[M] has been [used_verb] with [src][showname]."), SPAN_DANGER("You [used_verb] [M == user ? "yourself":M] with [src]."), null, 5, CHAT_TYPE_MELEE_HIT) user.animation_attack_on(M) diff --git a/code/_onclick/xeno.dm b/code/_onclick/xeno.dm index 2894d9f370d4..b6d24ec05dfb 100644 --- a/code/_onclick/xeno.dm +++ b/code/_onclick/xeno.dm @@ -82,10 +82,10 @@ animation_attack_on(target) playsound(loc, 'sound/weapons/alien_claw_swipe.ogg', 10, 1) //Quiet to limit spam/nuisance. if(firepatted) - src.visible_message(SPAN_DANGER("\The [src] pats at the fire!"), \ + src.visible_message(SPAN_DANGER("\The [src] pats at the fire!"), SPAN_DANGER("We pat the fire!"), null, 5, CHAT_TYPE_XENO_COMBAT) else - src.visible_message(SPAN_DANGER("\The [src] swipes at \the [target]!"), \ + src.visible_message(SPAN_DANGER("\The [src] swipes at \the [target]!"), SPAN_DANGER("We swipe at \the [target]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return TRUE diff --git a/code/datums/ammo/bullet/bullet.dm b/code/datums/ammo/bullet/bullet.dm index dadb644201df..9adc4ba2ae50 100644 --- a/code/datums/ammo/bullet/bullet.dm +++ b/code/datums/ammo/bullet/bullet.dm @@ -66,7 +66,7 @@ shake_camera(execution_target, 3, 4) execution_target.update_headshot_overlay(headshot_state) //...and add a gory headshot overlay. - execution_target.visible_message(SPAN_HIGHDANGER(uppertext("[execution_target] WAS EXECUTED!")), \ + execution_target.visible_message(SPAN_HIGHDANGER(uppertext("[execution_target] WAS EXECUTED!")), SPAN_HIGHDANGER("You WERE EXECUTED!")) user.count_niche_stat(STATISTICS_NICHE_EXECUTION, 1, firing_projectile.weapon_cause_data?.cause_name) diff --git a/code/datums/elements/bullet_trait/incendiary.dm b/code/datums/elements/bullet_trait/incendiary.dm index 74a7e32cc324..3c8d9ea75865 100644 --- a/code/datums/elements/bullet_trait/incendiary.dm +++ b/code/datums/elements/bullet_trait/incendiary.dm @@ -55,6 +55,6 @@ projectile_target.adjust_fire_stacks(burn_stacks/2 + floor(damage_actual / 4), burn_reagent) projectile_target.IgniteMob() projectile_target.visible_message( - SPAN_DANGER("[projectile_target] bursts into flames!"), \ - SPAN_XENODANGER("You burst into flames!! Auuugh! Resist to put out the flames!") \ + SPAN_DANGER("[projectile_target] bursts into flames!"), + SPAN_XENODANGER("You burst into flames!! Auuugh! Resist to put out the flames!") ) diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 016d7b45b5d8..a9afd36267c4 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -220,7 +220,7 @@ /obj/structure/machinery/optable/proc/take_victim(mob/living/carbon/C, mob/living/carbon/user) if (C == user) - user.visible_message(SPAN_NOTICE("[user] climbs on the operating table."), \ + user.visible_message(SPAN_NOTICE("[user] climbs on the operating table."), SPAN_NOTICE("You climb on the operating table."), null, null, 4) else visible_message(SPAN_NOTICE("[C] has been laid on the operating table by [user]."), null, 4) diff --git a/code/game/machinery/colony_floodlights.dm b/code/game/machinery/colony_floodlights.dm index 91ebbb28fb99..1d554de73b0c 100644 --- a/code/game/machinery/colony_floodlights.dm +++ b/code/game/machinery/colony_floodlights.dm @@ -144,19 +144,19 @@ GLOBAL_LIST_INIT(all_breaker_switches, list()) if(repair_state == FLOODLIGHT_REPAIR_UNSCREW) playsound(loc, 'sound/items/Screwdriver.ogg', 25, 1) - user.visible_message(SPAN_NOTICE("[user] starts unscrewing [src]'s maintenance hatch."), \ + user.visible_message(SPAN_NOTICE("[user] starts unscrewing [src]'s maintenance hatch."), SPAN_NOTICE("You start unscrewing [src]'s maintenance hatch.")) if(do_after(user, 2 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) if(QDELETED(src) || repair_state != FLOODLIGHT_REPAIR_UNSCREW) return playsound(loc, 'sound/items/Screwdriver.ogg', 25, 1) repair_state = FLOODLIGHT_REPAIR_CROWBAR - user.visible_message(SPAN_NOTICE("[user] unscrews [src]'s maintenance hatch."), \ + user.visible_message(SPAN_NOTICE("[user] unscrews [src]'s maintenance hatch."), SPAN_NOTICE("You unscrew [src]'s maintenance hatch.")) else if(repair_state == FLOODLIGHT_REPAIR_SCREW) playsound(loc, 'sound/items/Screwdriver.ogg', 25, 1) - user.visible_message(SPAN_NOTICE("[user] starts screwing [src]'s maintenance hatch closed."), \ + user.visible_message(SPAN_NOTICE("[user] starts screwing [src]'s maintenance hatch closed."), SPAN_NOTICE("You start screwing [src]'s maintenance hatch closed.")) if(do_after(user, 2 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) if(QDELETED(src) || repair_state != FLOODLIGHT_REPAIR_SCREW) @@ -165,7 +165,7 @@ GLOBAL_LIST_INIT(all_breaker_switches, list()) damaged = FALSE repair_state = FLOODLIGHT_REPAIR_UNSCREW health = initial(health) - user.visible_message(SPAN_NOTICE("[user] screws [src]'s maintenance hatch closed."), \ + user.visible_message(SPAN_NOTICE("[user] screws [src]'s maintenance hatch closed."), SPAN_NOTICE("You screw [src]'s maintenance hatch closed.")) if(is_on) set_light(lum_value) @@ -179,14 +179,14 @@ GLOBAL_LIST_INIT(all_breaker_switches, list()) if(repair_state == FLOODLIGHT_REPAIR_CROWBAR) playsound(loc, 'sound/items/Crowbar.ogg', 25, 1) - user.visible_message(SPAN_NOTICE("[user] starts prying [src]'s damaged lighting assembly out."),\ + user.visible_message(SPAN_NOTICE("[user] starts prying [src]'s damaged lighting assembly out."), SPAN_NOTICE("You start prying [src]'s damaged lighting assembly out.")) if(do_after(user, 2 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) if(QDELETED(src) || repair_state != FLOODLIGHT_REPAIR_CROWBAR) return playsound(loc, 'sound/items/Crowbar.ogg', 25, 1) repair_state = FLOODLIGHT_REPAIR_WELD - user.visible_message(SPAN_NOTICE("[user] pries [src]'s damaged lighting assembly out."),\ + user.visible_message(SPAN_NOTICE("[user] pries [src]'s damaged lighting assembly out."), SPAN_NOTICE("You pry [src]'s damaged lighting assembly out.")) return TRUE @@ -228,7 +228,7 @@ GLOBAL_LIST_INIT(all_breaker_switches, list()) to_chat(user, SPAN_WARNING("You need two coils of wire to replace the damaged cables.")) return playsound(loc, 'sound/items/Deconstruct.ogg', 25, 1) - user.visible_message(SPAN_NOTICE("[user] starts replacing [src]'s damaged cables."),\ + user.visible_message(SPAN_NOTICE("[user] starts replacing [src]'s damaged cables."), SPAN_NOTICE("You start replacing [src]'s damaged cables.")) if(do_after(user, 2 SECONDS, INTERRUPT_ALL, BUSY_ICON_GENERIC)) if(QDELETED(src) || repair_state != FLOODLIGHT_REPAIR_CABLE) @@ -236,7 +236,7 @@ GLOBAL_LIST_INIT(all_breaker_switches, list()) if(coil.use(2)) playsound(loc, 'sound/items/Deconstruct.ogg', 25, 1) repair_state = FLOODLIGHT_REPAIR_SCREW - user.visible_message(SPAN_NOTICE("[user] replaces [src]'s damaged cables."),\ + user.visible_message(SPAN_NOTICE("[user] replaces [src]'s damaged cables."), SPAN_NOTICE("You replace [src]'s damaged cables.")) return TRUE @@ -257,14 +257,14 @@ GLOBAL_LIST_INIT(all_breaker_switches, list()) to_chat(user, replacer.failmsg) return FALSE playsound(loc, 'sound/items/Crowbar.ogg', 25, 1) - user.visible_message(SPAN_NOTICE("[user] starts replacing [src]'s damaged lighting assembly."),\ + user.visible_message(SPAN_NOTICE("[user] starts replacing [src]'s damaged lighting assembly."), SPAN_NOTICE("You start replacing [src]'s damaged lighting assembly.")) if(do_after(user, 2 SECONDS, INTERRUPT_ALL, BUSY_ICON_GENERIC)) if(QDELETED(src) || repair_state == FLOODLIGHT_REPAIR_SCREW) return replacer.Use(user) repair_state = FLOODLIGHT_REPAIR_SCREW - user.visible_message(SPAN_NOTICE("[user] replaces [src]'s damaged lighting assembly."),\ + user.visible_message(SPAN_NOTICE("[user] replaces [src]'s damaged lighting assembly."), SPAN_NOTICE("You replace [src]'s damaged lighting assembly.")) return TRUE diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 5da5e356bf2a..a06120b50f12 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -572,13 +572,13 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( add_fingerprint(user) if(istype(attacking_item, /obj/item/weapon/zombie_claws) && (welded || locked)) - user.visible_message(SPAN_NOTICE("[user] starts tearing into the door on [src]!"), \ - SPAN_NOTICE("You start prying your hand into the gaps of the door with your fingers... This will take about 30 seconds."), \ + user.visible_message(SPAN_NOTICE("[user] starts tearing into the door on [src]!"), + SPAN_NOTICE("You start prying your hand into the gaps of the door with your fingers... This will take about 30 seconds."), SPAN_NOTICE("You hear tearing noises!")) if(do_after(user, 300, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) - user.visible_message(SPAN_NOTICE("[user] slams the door open [src]!"), \ - SPAN_NOTICE("You slam the door open!"), \ + user.visible_message(SPAN_NOTICE("[user] slams the door open [src]!"), + SPAN_NOTICE("You slam the door open!"), SPAN_NOTICE("You hear metal screeching!")) locked = 0 welded = 0 @@ -601,8 +601,8 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( to_chat(user, SPAN_WARNING("\The [W] needs to be on!")) return if(W.remove_fuel(0,user)) - user.visible_message(SPAN_NOTICE("[user] starts working on \the [src] with \the [W]."), \ - SPAN_NOTICE("You start working on \the [src] with \the [W]."), \ + user.visible_message(SPAN_NOTICE("[user] starts working on \the [src] with \the [W]."), + SPAN_NOTICE("You start working on \the [src] with \the [W]."), SPAN_NOTICE("You hear welding.")) playsound(loc, 'sound/items/weldingtool_weld.ogg', 25) if(do_after(user, weldtime, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD) && density) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 74268193c94d..8df592c67426 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -143,8 +143,8 @@ to_chat(user, SPAN_WARNING("Access denied. Please wait for authorities to arrive, or for the alert to clear.")) return else - user.visible_message(SPAN_NOTICE("\The [src] [density ? "open" : "close"]s for \the [user]."),\ - "\The [src] [density ? "open" : "close"]s.",\ + user.visible_message(SPAN_NOTICE("\The [src] [density ? "open" : "close"]s for \the [user]."), + "\The [src] [density ? "open" : "close"]s.", "You hear a beep, and a door opening.") var/needs_to_close = 0 @@ -175,8 +175,8 @@ var/obj/item/tool/weldingtool/W = C if(W.remove_fuel(0, user)) blocked = !blocked - user.visible_message(SPAN_DANGER("\The [user] [blocked ? "welds" : "unwelds"] \the [src] with \a [W]."),\ - "You [blocked ? "weld" : "unweld"] \the [src] with \the [W].",\ + user.visible_message(SPAN_DANGER("\The [user] [blocked ? "welds" : "unwelds"] \the [src] with \a [W]."), + "You [blocked ? "weld" : "unweld"] \the [src] with \the [W].", "You hear something being welded.") update_icon() return @@ -186,19 +186,19 @@ return if(blocked) - user.visible_message(SPAN_DANGER("\The [user] pries at \the [src] with \a [C], but \the [src] is welded in place!"),\ - "You try to pry \the [src] [density ? "open" : "closed"], but it is welded in place!",\ + user.visible_message(SPAN_DANGER("\The [user] pries at \the [src] with \a [C], but \the [src] is welded in place!"), + "You try to pry \the [src] [density ? "open" : "closed"], but it is welded in place!", "You hear someone struggle and metal straining.") return - user.visible_message(SPAN_DANGER("\The [user] starts to force \the [src] [density ? "open" : "closed"] with \a [C]!"),\ - SPAN_NOTICE("You start forcing \the [src] [density ? "open" : "closed"] with \the [C]!"),\ + user.visible_message(SPAN_DANGER("\The [user] starts to force \the [src] [density ? "open" : "closed"] with \a [C]!"), + SPAN_NOTICE("You start forcing \the [src] [density ? "open" : "closed"] with \the [C]!"), "You hear metal strain.") var/old_density = density if(do_after(user, 30, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) if(blocked || density != old_density) return - user.visible_message(SPAN_DANGER("\The [user] forces \the [blocked ? "welded " : "" ][name] [density ? "open" : "closed"] with \a [C]!"),\ - SPAN_NOTICE("You force \the [blocked ? "welded " : ""][name] [density ? "open" : "closed"] with \the [C]!"),\ + user.visible_message(SPAN_DANGER("\The [user] forces \the [blocked ? "welded " : "" ][name] [density ? "open" : "closed"] with \a [C]!"), + SPAN_NOTICE("You force \the [blocked ? "welded " : ""][name] [density ? "open" : "closed"] with \the [C]!"), "You hear metal strain and groan, and a door [density ? "opening" : "closing"].") spawn(0) if(density) @@ -213,12 +213,12 @@ if(istype(C, /obj/item/weapon/zombie_claws)) if(operating) return - user.visible_message(SPAN_DANGER("\The zombie starts to force \the [src] [density ? "open" : "closed"] with it's claws!!!"),\ - "You start forcing \the [src] [density ? "open" : "closed"] with your claws!",\ + user.visible_message(SPAN_DANGER("\The zombie starts to force \the [src] [density ? "open" : "closed"] with it's claws!!!"), + "You start forcing \the [src] [density ? "open" : "closed"] with your claws!", "You hear metal strain.") if(do_after(user, 150, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) - user.visible_message(SPAN_DANGER("\The [user] forces \the [ blocked ? "welded" : "" ] [src] [density ? "open" : "closed"] with \a [C]!"),\ - "You force \the [ blocked ? "welded" : "" ] [src] [density ? "open" : "closed"] with \the [C]!",\ + user.visible_message(SPAN_DANGER("\The [user] forces \the [ blocked ? "welded" : "" ] [src] [density ? "open" : "closed"] with \a [C]!"), + "You force \the [ blocked ? "welded" : "" ] [src] [density ? "open" : "closed"] with \the [C]!", "You hear metal strain and groan, and a door [density ? "opening" : "closing"].") if(density) INVOKE_ASYNC(src, PROC_REF(open), TRUE) diff --git a/code/game/machinery/doors/poddoor/poddoor.dm b/code/game/machinery/doors/poddoor/poddoor.dm index 7e819e190f4a..40cd83f3dd51 100644 --- a/code/game/machinery/doors/poddoor/poddoor.dm +++ b/code/game/machinery/doors/poddoor/poddoor.dm @@ -52,7 +52,7 @@ return XENO_ATTACK_ACTION /obj/structure/machinery/door/poddoor/proc/pry_open(mob/living/carbon/xenomorph/X, time = 4 SECONDS) - X.visible_message(SPAN_DANGER("[X] begins prying [src] open."),\ + X.visible_message(SPAN_DANGER("[X] begins prying [src] open."), SPAN_XENONOTICE("You start prying [src] open."), max_distance = 3) playsound(loc, 'sound/effects/metal_creaking.ogg', 25, TRUE) @@ -61,7 +61,7 @@ to_chat(X, "You stop prying [src] open.") return - X.visible_message(SPAN_DANGER("[X] pries open [src]."), \ + X.visible_message(SPAN_DANGER("[X] pries open [src]."), SPAN_XENONOTICE("You pry open [src]."), max_distance = 3) open() diff --git a/code/game/machinery/fusion_engine.dm b/code/game/machinery/fusion_engine.dm index eaf791130dfc..9398d33914a5 100644 --- a/code/game/machinery/fusion_engine.dm +++ b/code/game/machinery/fusion_engine.dm @@ -240,7 +240,7 @@ if(overloaded) xeno.animation_attack_on(src) playsound(src, 'sound/effects/metalhit.ogg', 25, 1) - xeno.visible_message(SPAN_DANGER("[xeno] [xeno.slashes_verb] [src], stopping its overload process!"), \ + xeno.visible_message(SPAN_DANGER("[xeno] [xeno.slashes_verb] [src], stopping its overload process!"), SPAN_DANGER("You [xeno.slash_verb] [src], stopping its overload process!"), null, 5, CHAT_TYPE_XENO_COMBAT) set_overloading(FALSE) return diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index f4a3a9f25cc3..27a9719b0735 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -65,7 +65,7 @@ return if(attached) - user.visible_message("[user] detaches \the [src] from \the [attached].", \ + user.visible_message("[user] detaches \the [src] from \the [attached].", "You detach \the [src] from \the [attached].") attached.active_transfusions -= src attached = null @@ -75,7 +75,7 @@ return if(in_range(src, usr) && iscarbon(over_object) && get_dist(over_object, src) <= 1) - user.visible_message("[user] attaches \the [src] to \the [over_object].", \ + user.visible_message("[user] attaches \the [src] to \the [over_object].", "You attach \the [src] to \the [over_object].") attached = over_object attached.active_transfusions += src diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index 21f1665818b8..263f2821301c 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -56,25 +56,25 @@ /obj/structure/machinery/microwave/attackby(obj/item/O as obj, mob/user as mob) if(broken > 0) if(broken == 2 && HAS_TRAIT(O, TRAIT_TOOL_SCREWDRIVER)) // If it's broken and they're using a screwdriver - user.visible_message( \ - SPAN_NOTICE("[user] starts to fix part of the microwave."), \ - SPAN_NOTICE("You start to fix part of the microwave.") \ + user.visible_message( + SPAN_NOTICE("[user] starts to fix part of the microwave."), + SPAN_NOTICE("You start to fix part of the microwave.") ) if (do_after(user,20, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) - user.visible_message( \ - SPAN_NOTICE("[user] fixes part of the microwave."), \ - SPAN_NOTICE("You have fixed part of the microwave. Now use a wrench!") \ + user.visible_message( + SPAN_NOTICE("[user] fixes part of the microwave."), + SPAN_NOTICE("You have fixed part of the microwave. Now use a wrench!") ) src.broken = 1 // Fix it a bit else if(src.broken == 1 && HAS_TRAIT(O, TRAIT_TOOL_WRENCH)) // If it's broken and they're doing the wrench - user.visible_message( \ - SPAN_NOTICE("[user] starts to fix part of the microwave."), \ - SPAN_NOTICE("You start to fix part of the microwave.") \ + user.visible_message( + SPAN_NOTICE("[user] starts to fix part of the microwave."), + SPAN_NOTICE("You start to fix part of the microwave.") ) if (do_after(user,20, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) - user.visible_message( \ - SPAN_NOTICE("[user] fixes the microwave."), \ - SPAN_NOTICE("You have fixed the microwave.") \ + user.visible_message( + SPAN_NOTICE("[user] fixes the microwave."), + SPAN_NOTICE("You have fixed the microwave.") ) icon_state = "mw" broken = 0 // Fix it! @@ -91,14 +91,14 @@ return else if(dirty==100) // The microwave is all dirty so can't be used! if(istype(O, /obj/item/reagent_container/spray/cleaner)) // If they're trying to clean it then let them - user.visible_message( \ - SPAN_NOTICE("[user] starts to clean the microwave."), \ - SPAN_NOTICE("You start to clean the microwave.") \ + user.visible_message( + SPAN_NOTICE("[user] starts to clean the microwave."), + SPAN_NOTICE("You start to clean the microwave.") ) if (do_after(user, 2 SECONDS * user.get_skill_duration_multiplier(SKILL_DOMESTIC), INTERRUPT_ALL, BUSY_ICON_FRIENDLY)) - user.visible_message( \ - SPAN_NOTICE("[user] has cleaned the microwave."), \ - SPAN_NOTICE("You have cleaned the microwave.") \ + user.visible_message( + SPAN_NOTICE("[user] has cleaned the microwave."), + SPAN_NOTICE("You have cleaned the microwave.") ) dirty = 0 // It's clean! broken = 0 // just to be sure @@ -117,15 +117,15 @@ var/obj/item/stack/S = O new O.type (src) S.use(1) - user.visible_message( \ - SPAN_NOTICE("[user] has added one of [O] to \the [src]."), \ + user.visible_message( + SPAN_NOTICE("[user] has added one of [O] to \the [src]."), SPAN_NOTICE("You add one of [O] to \the [src].")) else // user.before_take_item(O) //This just causes problems so far as I can tell. -Pete if(user.drop_held_item()) O.forceMove(src) - user.visible_message( \ - SPAN_NOTICE("[user] has added \the [O] to \the [src]."), \ + user.visible_message( + SPAN_NOTICE("[user] has added \the [O] to \the [src]."), SPAN_NOTICE("You add \the [O] to \the [src].")) else if(istype(O,/obj/item/reagent_container/glass) || istype(O,/obj/item/reagent_container/food/drinks) || istype(O,/obj/item/reagent_container/food/condiment)) // TODO: typecache this if (!O.reagents) diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index 49d7ee249ed1..a57f2cc46f0e 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -119,7 +119,7 @@ return 1 if(!P.can_use(user)) return 1 - user.visible_message("[user] put [what] into [src].", \ + user.visible_message("[user] put [what] into [src].", "You put [what] into [src].") user.drop_held_item() what.forceMove(src) @@ -139,15 +139,15 @@ log_admin("DEBUG: [O] in processor havent suitable recipe. How do you put it in?") //-rastaf0 continue src.processing = 1 - user.visible_message(SPAN_NOTICE("[user] turns on [src]."), \ - "You turn on [src].", \ + user.visible_message(SPAN_NOTICE("[user] turns on [src]."), + "You turn on [src].", "You hear a food processor.") playsound(src.loc, 'sound/machines/blender.ogg', 25, 1) use_power(500) sleep(P.time) P.process(src.loc, O) src.processing = 0 - src.visible_message(SPAN_NOTICE("\the [src] finished processing."), \ + src.visible_message(SPAN_NOTICE("\the [src] finished processing."), "You hear the food processor stopping/") /obj/structure/machinery/processor/yautja diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index f047a4aa5f8b..184eedea348b 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -109,7 +109,7 @@ if(accept_check(O)) if(user.drop_held_item()) add_local_item(O) - user.visible_message(SPAN_NOTICE("[user] has added \the [O] to \the [src]."), \ + user.visible_message(SPAN_NOTICE("[user] has added \the [O] to \the [src]."), SPAN_NOTICE("You add \the [O] to \the [src].")) else if(istype(O, /obj/item/storage/bag/plants)) @@ -122,8 +122,8 @@ plants_loaded++ if(plants_loaded) - user.visible_message( \ - SPAN_NOTICE("[user] loads \the [src] with \the [P]."), \ + user.visible_message( + SPAN_NOTICE("[user] loads \the [src] with \the [P]."), SPAN_NOTICE("You load \the [src] with \the [P].")) if(length(P.contents) > 0) to_chat(user, SPAN_NOTICE("Some items are refused.")) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 2f8001e97e5a..1d23e5e1e5a4 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -579,9 +579,9 @@ Buildable meters new_pipe.search_for_connections() playsound(loc, 'sound/items/Ratchet.ogg', 25, 1) - user.visible_message( \ - "[user] fastens [src].", \ - SPAN_NOTICE("You have fastened [src]."), \ + user.visible_message( + "[user] fastens [src].", + SPAN_NOTICE("You have fastened [src]."), "You hear ratchet.") qdel(src) // remove the pipe item diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index bfe955cd99bc..d0d01fdda85c 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -108,9 +108,9 @@ playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1) to_chat(user, SPAN_NOTICE(" You begin to unfasten \the [src] from the floor...")) if (do_after(user, 40, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) - user.visible_message( \ - "[user] unfastens \the [src].", \ - SPAN_NOTICE("You have unfastened \the [src]. Now it can be pulled somewhere else."), \ + user.visible_message( + "[user] unfastens \the [src].", + SPAN_NOTICE("You have unfastened \the [src]. Now it can be pulled somewhere else."), "You hear ratchet.") src.anchored = FALSE src.stat |= MAINT @@ -121,9 +121,9 @@ playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1) to_chat(user, SPAN_NOTICE(" You begin to fasten \the [src] to the floor...")) if (do_after(user, 20, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) - user.visible_message( \ - "[user] fastens \the [src].", \ - SPAN_NOTICE("You have fastened \the [src]. Now it can dispense pipes."), \ + user.visible_message( + "[user] fastens \the [src].", + SPAN_NOTICE("You have fastened \the [src]. Now it can dispense pipes."), "You hear ratchet.") src.anchored = TRUE src.stat &= ~MAINT diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index ea31149c72ad..e7d806277ba2 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -382,12 +382,12 @@ GLOBAL_LIST_EMPTY(vending_products) user.animation_attack_on(src) if(prob(user.melee_damage_lower)) playsound(loc, 'sound/effects/metalhit.ogg', 25, 1) - user.visible_message(SPAN_DANGER("[user] smashes [src] beyond recognition!"), \ + user.visible_message(SPAN_DANGER("[user] smashes [src] beyond recognition!"), SPAN_DANGER("You enter a frenzy and smash [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) malfunction() tip_over() else - user.visible_message(SPAN_DANGER("[user] slashes [src]!"), \ + user.visible_message(SPAN_DANGER("[user] slashes [src]!"), SPAN_DANGER("You slash [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) playsound(loc, 'sound/effects/metalhit.ogg', 25, 1) return XENO_ATTACK_ACTION @@ -403,7 +403,7 @@ GLOBAL_LIST_EMPTY(vending_products) spark_system.set_up(5, 5, get_turf(src)) hacked = TRUE return XENO_ATTACK_ACTION - user.visible_message(SPAN_WARNING("[user] begins to lean against [src]."), \ + user.visible_message(SPAN_WARNING("[user] begins to lean against [src]."), SPAN_WARNING("You begin to lean against [src]."), null, 5, CHAT_TYPE_XENO_COMBAT) var/shove_time = 80 if(user.mob_size >= MOB_SIZE_BIG) @@ -415,7 +415,7 @@ GLOBAL_LIST_EMPTY(vending_products) if(do_after(user, shove_time, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) user.animation_attack_on(src) - user.visible_message(SPAN_DANGER("[user] knocks [src] down!"), \ + user.visible_message(SPAN_DANGER("[user] knocks [src] down!"), SPAN_DANGER("You knock [src] down!"), null, 5, CHAT_TYPE_XENO_COMBAT) tip_over() return XENO_NO_DELAY_ACTION @@ -1012,25 +1012,25 @@ GLOBAL_LIST_EMPTY(vending_products) to_chat(user, SPAN_WARNING("[src] is already being restocked, you will get in the way!")) return - user.visible_message(SPAN_NOTICE("[user] starts stocking a bunch of supplies into [src]."), \ + user.visible_message(SPAN_NOTICE("[user] starts stocking a bunch of supplies into [src]."), SPAN_NOTICE("You start stocking a bunch of supplies into [src].")) being_restocked = TRUE for(var/obj/item/item in container.contents) if(!do_after(user, 1 SECONDS, INTERRUPT_ALL, BUSY_ICON_GENERIC, src)) being_restocked = FALSE - user.visible_message(SPAN_NOTICE("[user] stopped stocking [src] with supplies."), \ + user.visible_message(SPAN_NOTICE("[user] stopped stocking [src] with supplies."), SPAN_NOTICE("You stop stocking [src] with supplies.")) return if(QDELETED(item) || item.loc != container) being_restocked = FALSE - user.visible_message(SPAN_NOTICE("[user] stopped stocking [src] with supplies."), \ + user.visible_message(SPAN_NOTICE("[user] stopped stocking [src] with supplies."), SPAN_NOTICE("You stop stocking [src] with supplies.")) return stock(item, user) being_restocked = FALSE - user.visible_message(SPAN_NOTICE("[user] finishes stocking [src] with supplies."), \ + user.visible_message(SPAN_NOTICE("[user] finishes stocking [src] with supplies."), SPAN_NOTICE("You finish stocking [src] with supplies.")) return @@ -1079,7 +1079,7 @@ GLOBAL_LIST_EMPTY(vending_products) container.remove_from_storage(item_to_stock, user.loc) qdel(item_to_stock) - user.visible_message(SPAN_NOTICE("[user] stocks [src] with \a [vendspec[1]]."), \ + user.visible_message(SPAN_NOTICE("[user] stocks [src] with \a [vendspec[1]]."), SPAN_NOTICE("You stock [src] with \a [vendspec[1]].")) if(partial_stacks) var/obj/item/stack/item_stack = item_to_stock diff --git a/code/game/machinery/vending/vendor_types/medical.dm b/code/game/machinery/vending/vendor_types/medical.dm index e704ffcf8277..c052d8b0d8f0 100644 --- a/code/game/machinery/vending/vendor_types/medical.dm +++ b/code/game/machinery/vending/vendor_types/medical.dm @@ -155,11 +155,11 @@ if(user.action_busy) return playsound(src, 'sound/items/Ratchet.ogg', 25, 1) - user.visible_message(SPAN_NOTICE("[user] starts to deconstruct [src]."), \ + user.visible_message(SPAN_NOTICE("[user] starts to deconstruct [src]."), SPAN_NOTICE("You start deconstructing [src].")) if(!do_after(user, 5 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) return - user.visible_message(SPAN_NOTICE("[user] deconstructs [src]."), \ + user.visible_message(SPAN_NOTICE("[user] deconstructs [src]."), SPAN_NOTICE("You deconstruct [src].")) playsound(src, 'sound/items/Crowbar.ogg', 25, 1) new /obj/item/stack/sheet/metal(loc) @@ -188,7 +188,7 @@ user.animation_attack_on(src) health -= (rand(user.melee_damage_lower, user.melee_damage_upper)) playsound(src, attacked_sound, 25, 1) - user.visible_message(SPAN_DANGER("[user] slashes [src]!"), \ + user.visible_message(SPAN_DANGER("[user] slashes [src]!"), SPAN_DANGER("You slash [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) healthcheck(user) return XENO_ATTACK_ACTION @@ -359,19 +359,19 @@ to_chat(user, SPAN_WARNING("[src] doesn't use [cart.supply_descriptor]!")) return - user.visible_message(SPAN_NOTICE("[user] starts stocking [cart.supply_descriptor] supplies into [src]."), \ + user.visible_message(SPAN_NOTICE("[user] starts stocking [cart.supply_descriptor] supplies into [src]."), SPAN_NOTICE("You start stocking [cart.supply_descriptor] into [src].")) being_restocked = TRUE while(cart.supplies_remaining > 0) if(!do_after(user, 1 SECONDS, INTERRUPT_ALL, BUSY_ICON_GENERIC, src)) being_restocked = FALSE - user.visible_message(SPAN_NOTICE("[user] stopped stocking [src] with [cart.supply_descriptor]."), \ + user.visible_message(SPAN_NOTICE("[user] stopped stocking [src] with [cart.supply_descriptor]."), SPAN_NOTICE("You stop stocking [src] with [cart.supply_descriptor].")) return if(QDELETED(cart) || get_dist(user, cart) > 1) being_restocked = FALSE - user.visible_message(SPAN_NOTICE("[user] stopped stocking [src] with [cart.supply_descriptor]."), \ + user.visible_message(SPAN_NOTICE("[user] stopped stocking [src] with [cart.supply_descriptor]."), SPAN_NOTICE("You stop stocking [src] with [cart.supply_descriptor].")) return @@ -386,7 +386,7 @@ cart.supplies_remaining-- being_restocked = FALSE - user.visible_message(SPAN_NOTICE("[user] finishes stocking [src] with [cart.supply_descriptor]."), \ + user.visible_message(SPAN_NOTICE("[user] finishes stocking [src] with [cart.supply_descriptor]."), SPAN_NOTICE("You finish stocking [src] with [cart.supply_descriptor].")) /obj/structure/machinery/cm_vending/sorted/medical/attackby(obj/item/I, mob/user) diff --git a/code/game/objects/effects/acid_hole.dm b/code/game/objects/effects/acid_hole.dm index db24c1c9c56a..1798df7e1099 100644 --- a/code/game/objects/effects/acid_hole.dm +++ b/code/game/objects/effects/acid_hole.dm @@ -140,7 +140,7 @@ if(do_after(user,10, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) if(Target.density) return - user.visible_message(SPAN_WARNING("[user] throws [G] through [src]!"), \ + user.visible_message(SPAN_WARNING("[user] throws [G] through [src]!"), SPAN_WARNING("You throw [G] through [src]")) user.drop_held_item() G.forceMove(Target) @@ -162,7 +162,7 @@ if(do_after(user,10, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) if(Target.density) return - user.visible_message(SPAN_WARNING("[user] throws [F] through [src]!"), \ + user.visible_message(SPAN_WARNING("[user] throws [F] through [src]!"), SPAN_WARNING("You throw [F] through [src]")) user.drop_held_item() F.forceMove(Target) diff --git a/code/game/objects/effects/effect_system/foam.dm b/code/game/objects/effects/effect_system/foam.dm index 0aceb8526691..58e4ef80ba4a 100644 --- a/code/game/objects/effects/effect_system/foam.dm +++ b/code/game/objects/effects/effect_system/foam.dm @@ -220,7 +220,7 @@ X.animation_attack_on(src) - X.visible_message(SPAN_DANGER("\The [X] slashes [src]!"), \ + X.visible_message(SPAN_DANGER("\The [X] slashes [src]!"), SPAN_DANGER("You slash [src]!")) take_damage(damage * FOAMED_METAL_XENO_SLASH) diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm index c64ff9a087df..4c7752538515 100644 --- a/code/game/objects/effects/effect_system/smoke.dm +++ b/code/game/objects/effects/effect_system/smoke.dm @@ -227,7 +227,7 @@ affected_mob.coughedtime = world.time + 2 SECONDS if(ishuman(affected_mob)) //Humans only to avoid issues if(issynth(affected_mob)) - affected_mob.visible_message(SPAN_DANGER("[affected_mob]'s skin is sloughing off!"),\ + affected_mob.visible_message(SPAN_DANGER("[affected_mob]'s skin is sloughing off!"), SPAN_DANGER("Your skin is sloughing off!")) else if(prob(50)) @@ -362,7 +362,7 @@ if(affected_mob.coughedtime < world.time && !affected_mob.stat) affected_mob.coughedtime = world.time + next_cough if(issynth(affected_mob)) - affected_mob.visible_message(SPAN_DANGER("[affected_mob]'s skin is sloughing off!"),\ + affected_mob.visible_message(SPAN_DANGER("[affected_mob]'s skin is sloughing off!"), SPAN_DANGER("Your skin is sloughing off!")) else affected_mob.emote("cough") @@ -557,7 +557,7 @@ if(affected_mob.coughedtime < world.time && !affected_mob.stat && ishuman(affected_mob)) //Coughing/gasping affected_mob.coughedtime = world.time + 1.5 SECONDS if(issynth(affected_mob)) - affected_mob.visible_message(SPAN_DANGER("[affected_mob]'s skin is sloughing off!"),\ + affected_mob.visible_message(SPAN_DANGER("[affected_mob]'s skin is sloughing off!"), SPAN_DANGER("Your skin is sloughing off!")) else if(prob(50)) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 1c8e6a626f5a..46c01754f967 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -111,7 +111,7 @@ if(length(tmp_label) > MAX_NAME_LEN) to_chat(user, SPAN_WARNING("The label can be at most [MAX_NAME_LEN] characters long.")) else - user.visible_message(SPAN_NOTICE("[user] labels [src] as \"[tmp_label]\"."), \ + user.visible_message(SPAN_NOTICE("[user] labels [src] as \"[tmp_label]\"."), SPAN_NOTICE("You label [src] as \"[tmp_label]\".")) AddComponent(/datum/component/label, tmp_label) playsound(src, "paper_writing", 15, TRUE) diff --git a/code/game/objects/items/books/book.dm b/code/game/objects/items/books/book.dm index 9fa7a36aed46..70dad180da9c 100644 --- a/code/game/objects/items/books/book.dm +++ b/code/game/objects/items/books/book.dm @@ -112,7 +112,7 @@ /obj/item/book/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(user.zone_selected == "eyes") - user.visible_message(SPAN_NOTICE("You open up the book and show it to [M]. "), \ + user.visible_message(SPAN_NOTICE("You open up the book and show it to [M]. "), SPAN_NOTICE(" [user] opens up a book and shows it to [M]. ")) show_browser(M, "Penned by [author].
[dat]", "window=book") diff --git a/code/game/objects/items/circuitboards/computer.dm b/code/game/objects/items/circuitboards/computer.dm index bbabacd19fb8..078dd821c6c7 100644 --- a/code/game/objects/items/circuitboards/computer.dm +++ b/code/game/objects/items/circuitboards/computer.dm @@ -220,7 +220,7 @@ return playsound(tool, 'sound/machines/lockenable.ogg', 25) - user.visible_message(SPAN_NOTICE("[user] attaches [tool] to [src]."),\ + user.visible_message(SPAN_NOTICE("[user] attaches [tool] to [src]."), SPAN_NOTICE("You begin to fix any tampering to [src].")) tool.icon_state = "[tool.icon_state]_on" diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index facb2cd64f3a..e6154db23b6e 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -84,7 +84,7 @@ /obj/item/facepaint/proc/paint_face(mob/living/carbon/human/H, mob/user) if(!H || !user) return //In case they're passed as null. - user.visible_message(SPAN_NOTICE("[user] carefully applies [src] on [H]'s face."), \ + user.visible_message(SPAN_NOTICE("[user] carefully applies [src] on [H]'s face."), SPAN_NOTICE("You apply [src].")) H.lip_style = paint_type H.update_body() diff --git a/code/game/objects/items/devices/coins.dm b/code/game/objects/items/devices/coins.dm index 8af46a526610..6ad020354a26 100644 --- a/code/game/objects/items/devices/coins.dm +++ b/code/game/objects/items/devices/coins.dm @@ -117,7 +117,7 @@ comment = "tails" else if(result == 2) comment = "heads" - user.visible_message(SPAN_NOTICE("[user] has thrown \the [src]. It lands on [comment]! "), \ + user.visible_message(SPAN_NOTICE("[user] has thrown \the [src]. It lands on [comment]! "), SPAN_NOTICE("You throw \the [src]. It lands on [comment]! ")) diff --git a/code/game/objects/items/devices/defibrillator.dm b/code/game/objects/items/devices/defibrillator.dm index a618d30d9387..2edfd82b0b46 100644 --- a/code/game/objects/items/devices/defibrillator.dm +++ b/code/game/objects/items/devices/defibrillator.dm @@ -211,13 +211,13 @@ to_chat(G, SPAN_BOLDNOTICE(FONT_SIZE_LARGE("Someone is trying to revive your body. Return to it if you want to be resurrected! \ (Verbs -> Ghost -> Re-enter corpse, or click here!)"))) - user.visible_message(SPAN_NOTICE("[user] starts setting up the [fluff_tool] on [target]'s [fluff_target_part]"), \ + user.visible_message(SPAN_NOTICE("[user] starts setting up the [fluff_tool] on [target]'s [fluff_target_part]"), SPAN_HELPFUL("You start setting up the [fluff_tool] on [target]'s [fluff_target_part].")) playsound(get_turf(src), sound_charge, 25, 0) //Do NOT vary this tune, it needs to be precisely 7 seconds //Taking square root not to make defibs too fast... if(!do_after(user, (4 + (3 * user.get_skill_duration_multiplier(SKILL_MEDICAL))) SECONDS, INTERRUPT_NO_NEEDHAND|BEHAVIOR_IMMOBILE, BUSY_ICON_FRIENDLY, target, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) - user.visible_message(SPAN_WARNING("[user] stops setting up the [fluff_tool] on [target]'s [fluff_target_part]."), \ + user.visible_message(SPAN_WARNING("[user] stops setting up the [fluff_tool] on [target]'s [fluff_target_part]."), SPAN_WARNING("You stop setting up the [fluff_tool] on [target]'s [fluff_target_part].")) return FALSE diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 3ffbcc46a345..6c5eb86a371b 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -122,11 +122,11 @@ if(being == user) //they're using it on themselves being.flash_eyes() - being.visible_message(SPAN_NOTICE("[being] directs [src] to [being.p_their()] eyes."), \ + being.visible_message(SPAN_NOTICE("[being] directs [src] to [being.p_their()] eyes."), SPAN_NOTICE("You wave the light in front of your eyes! Wow, that's trippy!")) return - user.visible_message(SPAN_NOTICE("[user] directs [src] to [being]'s eyes."), \ + user.visible_message(SPAN_NOTICE("[user] directs [src] to [being]'s eyes."), SPAN_NOTICE("You direct [src] to [being]'s eyes.")) if(ishuman_strict(being)) //robots and aliens are unaffected @@ -182,7 +182,7 @@ return // they have no organs somehow if(being == user) //they're using it on themselves being.flash_eyes() - being.visible_message(SPAN_NOTICE("[being] directs [src] to [being.p_their()] eyes."), \ + being.visible_message(SPAN_NOTICE("[being] directs [src] to [being.p_their()] eyes."), SPAN_NOTICE("You wave the light in front of your eyes! Wow, that's trippy!")) return if(being.stat == DEAD || (being.status_flags&FAKEDEATH)) @@ -446,7 +446,7 @@ if(!on) return var/hand = user.hand ? "l_hand" : "r_hand" - user.visible_message(SPAN_WARNING("[user] snuffs out [src]."),\ + user.visible_message(SPAN_WARNING("[user] snuffs out [src]."), SPAN_WARNING("You snuff out [src], singing your hand.")) user.apply_damage(7, BURN, hand) burn_out() diff --git a/code/game/objects/items/explosives/grenades/grenade.dm b/code/game/objects/items/explosives/grenades/grenade.dm index 9b67281e9f31..f157d7f8d931 100644 --- a/code/game/objects/items/explosives/grenades/grenade.dm +++ b/code/game/objects/items/explosives/grenades/grenade.dm @@ -79,7 +79,7 @@ cause_data = create_cause_data(initial(name), user) - user.visible_message(SPAN_WARNING("[user] primes \a [name]!"), \ + user.visible_message(SPAN_WARNING("[user] primes \a [name]!"), SPAN_WARNING("You prime \a [name]!")) msg_admin_attack("[key_name(user)] primed \a grenade ([name]) in [get_area(src)] ([src.loc.x],[src.loc.y],[src.loc.z]).", src.loc.x, src.loc.y, src.loc.z) user.attack_log += text("\[[time_stamp()]\] [key_name(user)] primed \a grenade ([name]) at ([src.loc.x],[src.loc.y],[src.loc.z])") diff --git a/code/game/objects/items/explosives/mine.dm b/code/game/objects/items/explosives/mine.dm index bb9f0bd424c3..e76d3ccc2781 100644 --- a/code/game/objects/items/explosives/mine.dm +++ b/code/game/objects/items/explosives/mine.dm @@ -82,7 +82,7 @@ user.visible_message(SPAN_NOTICE("[user] starts deploying [src]."), SPAN_NOTICE("You start deploying [src].")) if(!do_after(user, 40, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) - user.visible_message(SPAN_NOTICE("[user] stops deploying [src]."), \ + user.visible_message(SPAN_NOTICE("[user] stops deploying [src]."), SPAN_NOTICE("You stop deploying \the [src].")) return @@ -92,7 +92,7 @@ if(check_for_obstacles(user)) return - user.visible_message(SPAN_NOTICE("[user] finishes deploying [src]."), \ + user.visible_message(SPAN_NOTICE("[user] finishes deploying [src]."), SPAN_NOTICE("You finish deploying [src].")) deploy_mine(user) @@ -118,13 +118,13 @@ if(user.action_busy) return if(user.faction == iff_signal) - user.visible_message(SPAN_NOTICE("[user] starts disarming [src]."), \ + user.visible_message(SPAN_NOTICE("[user] starts disarming [src]."), SPAN_NOTICE("You start disarming [src].")) else - user.visible_message(SPAN_NOTICE("[user] starts fiddling with \the [src], trying to disarm it."), \ + user.visible_message(SPAN_NOTICE("[user] starts fiddling with \the [src], trying to disarm it."), SPAN_NOTICE("You start disarming [src], but you don't know its IFF data. This might end badly...")) if(!do_after(user, 30, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY)) - user.visible_message(SPAN_WARNING("[user] stops disarming [src]."), \ + user.visible_message(SPAN_WARNING("[user] stops disarming [src]."), SPAN_WARNING("You stop disarming [src].")) return if(user.faction != iff_signal) //ow! @@ -137,7 +137,7 @@ prime() if(!active)//someone beat us to it return - user.visible_message(SPAN_NOTICE("[user] finishes disarming [src]."), \ + user.visible_message(SPAN_NOTICE("[user] finishes disarming [src]."), SPAN_NOTICE("You finish disarming [src].")) disarm() @@ -209,8 +209,8 @@ return if(HAS_TRAIT(L, TRAIT_ABILITY_BURROWED)) return - L.visible_message(SPAN_DANGER("[icon2html(src, viewers(src))] The [name] clicks as [L] moves in front of it."), \ - SPAN_DANGER("[icon2html(src, L)] The [name] clicks as you move in front of it."), \ + L.visible_message(SPAN_DANGER("[icon2html(src, viewers(src))] The [name] clicks as [L] moves in front of it."), + SPAN_DANGER("[icon2html(src, L)] The [name] clicks as you move in front of it."), SPAN_DANGER("You hear a click.")) triggered = TRUE @@ -242,7 +242,7 @@ return XENO_NO_DELAY_ACTION M.animation_attack_on(src) - M.visible_message(SPAN_DANGER("[M] has slashed [src]!"), \ + M.visible_message(SPAN_DANGER("[M] has slashed [src]!"), SPAN_DANGER("You slash [src]!")) playsound(loc, 'sound/weapons/slice.ogg', 25, 1) diff --git a/code/game/objects/items/explosives/plastic.dm b/code/game/objects/items/explosives/plastic.dm index 44538da7aace..3d18413a5e49 100644 --- a/code/game/objects/items/explosives/plastic.dm +++ b/code/game/objects/items/explosives/plastic.dm @@ -136,15 +136,15 @@ if(active) if(user.action_busy) return - user.visible_message(SPAN_NOTICE("[user] starts disarming [src]."), \ + user.visible_message(SPAN_NOTICE("[user] starts disarming [src]."), SPAN_NOTICE("You start disarming [src].")) if(!do_after(user, 30, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY)) - user.visible_message(SPAN_WARNING("[user] stops disarming [src]."), \ + user.visible_message(SPAN_WARNING("[user] stops disarming [src]."), SPAN_WARNING("You stop disarming [src].")) return if(!active)//someone beat us to it return - user.visible_message(SPAN_NOTICE("[user] finishes disarming [src]."), \ + user.visible_message(SPAN_NOTICE("[user] finishes disarming [src]."), SPAN_NOTICE("You finish disarming [src].")) disarm() else diff --git a/code/game/objects/items/frames/light_fixtures.dm b/code/game/objects/items/frames/light_fixtures.dm index b52e19492cab..383c9cf00a2e 100644 --- a/code/game/objects/items/frames/light_fixtures.dm +++ b/code/game/objects/items/frames/light_fixtures.dm @@ -40,7 +40,7 @@ newlight = new /obj/structure/machinery/light_construct(constrloc) newlight.setDir(constrdir) transfer_fingerprints_to(newlight) - usr.visible_message("[usr.name] attaches [src] to the wall.", \ + usr.visible_message("[usr.name] attaches [src] to the wall.", "You attach [src] to the wall.") qdel(src) diff --git a/code/game/objects/items/fulton.dm b/code/game/objects/items/fulton.dm index a4871c6a3a6d..5d11e86216e4 100644 --- a/code/game/objects/items/fulton.dm +++ b/code/game/objects/items/fulton.dm @@ -62,7 +62,7 @@ GLOBAL_LIST_EMPTY(deployed_fultons) return /obj/item/stack/fulton/attack(mob/M as mob, mob/user as mob) - return ATTACKBY_HINT_UPDATE_NEXT_MOVE + return ATTACKBY_HINT_UPDATE_NEXT_MOVE /obj/item/stack/fulton/attack_hand(mob/user as mob) if (attached_atom) @@ -117,7 +117,7 @@ GLOBAL_LIST_EMPTY(deployed_fultons) break if(can_attach) - user.visible_message(SPAN_WARNING("[user] begins attaching [src] onto [target_atom]."), \ + user.visible_message(SPAN_WARNING("[user] begins attaching [src] onto [target_atom]."), SPAN_WARNING("You begin to attach [src] onto [target_atom].")) if(do_after(user, 50 * user.get_skill_duration_multiplier(SKILL_INTEL), INTERRUPT_ALL, BUSY_ICON_GENERIC)) if(!amount || get_dist(target_atom,user) > 1) diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm index 372324900aeb..5ba689999bf4 100644 --- a/code/game/objects/items/misc.dm +++ b/code/game/objects/items/misc.dm @@ -211,7 +211,7 @@ to_chat(user, SPAN_NOTICE("[src] already has something inside it.")) return - user.visible_message("[user] puts [I] into [src]", "You put [I] inside [src].",\ + user.visible_message("[user] puts [I] into [src]", "You put [I] inside [src].", "You hear a rustle as someone puts something into a plastic bag.") icon_state = "evidence" @@ -242,7 +242,7 @@ if(length(contents)) var/obj/item/I = contents[1] - user.visible_message("[user] takes [I] out of [src]", "You take [I] out of [src].",\ + user.visible_message("[user] takes [I] out of [src]", "You take [I] out of [src].", "You hear someone rustle around in a plastic bag, and remove something.") overlays.Cut() //remove the overlays diff --git a/code/game/objects/items/reagent_containers/blood_pack.dm b/code/game/objects/items/reagent_containers/blood_pack.dm index 5dafafe6a47f..232ef42cead0 100644 --- a/code/game/objects/items/reagent_containers/blood_pack.dm +++ b/code/game/objects/items/reagent_containers/blood_pack.dm @@ -65,7 +65,7 @@ if(connected_to == attacked_mob) STOP_PROCESSING(SSobj, src) - user.visible_message("[user] detaches [src] from [connected_to].", \ + user.visible_message("[user] detaches [src] from [connected_to].", "You detach [src] from [connected_to].") connected_to.active_transfusions -= src connected_to.base_pixel_x = 0 @@ -91,7 +91,7 @@ connected_to.active_transfusions += src connected_to.base_pixel_x = 5 START_PROCESSING(SSobj, src) - user.visible_message("[user] attaches \the [src] to [connected_to].", \ + user.visible_message("[user] attaches \the [src] to [connected_to].", "You attach \the [src] to [connected_to].") update_beam() diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index 377134373b3d..6559b3b9ac85 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -172,9 +172,9 @@ to_chat(user, SPAN_DANGER("You already have something on your [U].")) return - user.visible_message( \ - "[user] scoops up some [src] with \the [U]!", \ - SPAN_NOTICE("You scoop up some [src] with \the [U]!") \ + user.visible_message( + "[user] scoops up some [src] with \the [U]!", + SPAN_NOTICE("You scoop up some [src] with \the [U]!") ) src.bitecount++ @@ -208,14 +208,14 @@ return 1 var/slices_lost = 0 if (!inaccurate) - user.visible_message( \ - SPAN_NOTICE("[user] slices \the [src]!"), \ - SPAN_NOTICE("You slice \the [src]!") \ + user.visible_message( + SPAN_NOTICE("[user] slices \the [src]!"), + SPAN_NOTICE("You slice \the [src]!") ) else - user.visible_message( \ - SPAN_NOTICE("[user] crudely slices \the [src] with [W]!"), \ - SPAN_NOTICE("You crudely slice \the [src] with your [W]!") \ + user.visible_message( + SPAN_NOTICE("[user] crudely slices \the [src] with [W]!"), + SPAN_NOTICE("You crudely slice \the [src] with your [W]!") ) slices_lost = rand(1,max(1,floor(slices_num/2))) var/reagents_per_slice = reagents.total_volume/slices_num diff --git a/code/game/objects/items/reagent_containers/glass.dm b/code/game/objects/items/reagent_containers/glass.dm index 2c253f98cacf..cbc66bc36582 100644 --- a/code/game/objects/items/reagent_containers/glass.dm +++ b/code/game/objects/items/reagent_containers/glass.dm @@ -178,7 +178,7 @@ if(tmp_label == "" || !tmp_label) if(labelcomponent) labelcomponent.remove_label() - user.visible_message(SPAN_NOTICE("[user] removes the label from \the [src]."), \ + user.visible_message(SPAN_NOTICE("[user] removes the label from \the [src]."), SPAN_NOTICE("You remove the label from \the [src].")) return else @@ -186,7 +186,7 @@ if(length(tmp_label) > MAX_NAME_LEN) to_chat(user, SPAN_WARNING("The label can be at most [MAX_NAME_LEN] characters long.")) else - user.visible_message(SPAN_NOTICE("[user] labels [src] as \"[tmp_label]\"."), \ + user.visible_message(SPAN_NOTICE("[user] labels [src] as \"[tmp_label]\"."), SPAN_NOTICE("You label [src] as \"[tmp_label]\".")) AddComponent(/datum/component/label, tmp_label) playsound(src, "paper_writing", 15, TRUE) diff --git a/code/game/objects/items/reagent_containers/hypospray.dm b/code/game/objects/items/reagent_containers/hypospray.dm index 13e66082f0c6..36762ba1ea90 100644 --- a/code/game/objects/items/reagent_containers/hypospray.dm +++ b/code/game/objects/items/reagent_containers/hypospray.dm @@ -206,7 +206,7 @@ M.attack_log += text("\[[time_stamp()]\] Used CQC skill to stop [key_name(user)] injecting them.") user.attack_log += text("\[[time_stamp()]\] Was stopped from injecting [key_name(M)] by their cqc skill.") msg_admin_attack("[key_name(user)] got robusted by the CQC of [key_name(M)] in [get_area(user)] ([user.loc.x],[user.loc.y],[user.loc.z]).", user.loc.x, user.loc.y, user.loc.z) - M.visible_message(SPAN_DANGER("[M]'s reflexes kick in and knock [user] to the ground before they could use \the [src]'!"), \ + M.visible_message(SPAN_DANGER("[M]'s reflexes kick in and knock [user] to the ground before they could use \the [src]'!"), SPAN_WARNING("You knock [user] to the ground before they inject you!"), null, 5) playsound(user.loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7) return 0 diff --git a/code/game/objects/items/reagent_containers/syringes.dm b/code/game/objects/items/reagent_containers/syringes.dm index 73f0646c3516..01a9d354b760 100644 --- a/code/game/objects/items/reagent_containers/syringes.dm +++ b/code/game/objects/items/reagent_containers/syringes.dm @@ -78,7 +78,7 @@ M.attack_log += text("\[[time_stamp()]\] Used CQC skill to stop [key_name(user)] injecting them.") user.attack_log += text("\[[time_stamp()]\] Was stopped from injecting [key_name(M)] by their cqc skill.") msg_admin_attack("[key_name(user)] got robusted by the CQC of [key_name(M)] in [get_area(user)] ([user.loc.x],[user.loc.y],[user.loc.z]).", user.loc.x, user.loc.y, user.loc.z) - M.visible_message(SPAN_DANGER("[M]'s reflexes kick in and knock [user] to the ground before they could use \the [src]'!"), \ + M.visible_message(SPAN_DANGER("[M]'s reflexes kick in and knock [user] to the ground before they could use \the [src]'!"), SPAN_WARNING("You knock [user] to the ground before they inject you!"), null, 5) playsound(user.loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7) return diff --git a/code/game/objects/items/stacks/cable_coil.dm b/code/game/objects/items/stacks/cable_coil.dm index ec05b26824e9..cb7140e34a75 100644 --- a/code/game/objects/items/stacks/cable_coil.dm +++ b/code/game/objects/items/stacks/cable_coil.dm @@ -325,7 +325,7 @@ if(S.burn_dam > 0 && use(1)) if(self_fixing) - user.visible_message(SPAN_WARNING("\The [user] begins fixing some burn damage on their [S.display_name]."), \ + user.visible_message(SPAN_WARNING("\The [user] begins fixing some burn damage on their [S.display_name]."), SPAN_WARNING("You begin to carefully patch some burn damage on your [S.display_name] so as not to void your warranty.")) if(!do_after(user, 30, INTERRUPT_ALL, BUSY_ICON_FRIENDLY)) return diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index 6502d56b20e0..608fe18bafb3 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -31,7 +31,7 @@ use(1) var/others_msg = "\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " the"] [S.display_name] with \the [src]." // Needs to create vars for these messages because macro doesn't work otherwise var/user_msg = "You apply some nanite paste at [user == M ? "your" : "[M]'s"] [S.display_name]." - user.visible_message(SPAN_NOTICE("[others_msg]"),\ + user.visible_message(SPAN_NOTICE("[others_msg]"), SPAN_NOTICE("[user_msg]")) else to_chat(user, SPAN_NOTICE("Nothing to fix here.")) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index de365a7f99d0..2001148c7d3e 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -211,7 +211,7 @@ Also change the icon to reflect the amount of sheets, if possible.*/ if(usr.action_busy) return var/time_mult = skillcheck(usr, SKILL_CONSTRUCTION, 2) ? 1 : 2 - usr.visible_message(SPAN_NOTICE("[usr] starts assembling \a [R.title]."), \ + usr.visible_message(SPAN_NOTICE("[usr] starts assembling \a [R.title]."), SPAN_NOTICE("You start assembling \a [R.title].")) if(!do_after(usr, max(R.time * time_mult, R.min_time), INTERRUPT_NO_NEEDHAND|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) return diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 36f4776e4c66..08811051fefa 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -62,7 +62,7 @@ user.visible_message(SPAN_WARNING("\The [user] tried to strap \the [src] onto [target_mob] but instead gets a tail swipe to the head!")) return FALSE - user.visible_message(SPAN_NOTICE("\The [user] starts strapping \the [src] onto [target_mob]."), \ + user.visible_message(SPAN_NOTICE("\The [user] starts strapping \the [src] onto [target_mob]."), SPAN_NOTICE("You start strapping \the [src] onto [target_mob]."), null, 5, CHAT_TYPE_FLUFF_ACTION) if(!do_after(user, HUMAN_STRIP_DELAY * user.get_skill_duration_multiplier(SKILL_CQC), INTERRUPT_ALL, BUSY_ICON_GENERIC, target_mob, INTERRUPT_MOVED, BUSY_ICON_GENERIC)) to_chat(user, SPAN_WARNING("You were interrupted!")) diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index 9a0d7589b650..25b014bd7f60 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -511,8 +511,8 @@ W is always an item. stop_warning prevents messaging. user may be null.**/ add_fingerprint(user) if(!prevent_warning) var/visidist = W.w_class >= 3 ? 3 : 1 - user.visible_message(SPAN_NOTICE("[user] puts [W] into [src]."),\ - SPAN_NOTICE("You put \the [W] into [src]."),\ + user.visible_message(SPAN_NOTICE("[user] puts [W] into [src]."), + SPAN_NOTICE("You put \the [W] into [src]."), null, visidist) orient2hud() for(var/mob/M in can_see_content()) diff --git a/code/game/objects/items/tools/experimental_tools.dm b/code/game/objects/items/tools/experimental_tools.dm index a3bd621cc02d..15a3082494bd 100644 --- a/code/game/objects/items/tools/experimental_tools.dm +++ b/code/game/objects/items/tools/experimental_tools.dm @@ -297,7 +297,7 @@ return if(target == attached) //are we attached to the target? - user.visible_message("[user] detaches \the [src] from [attached].", \ + user.visible_message("[user] detaches \the [src] from [attached].", "You detach \the [src] from [attached].") attached = null filtering = FALSE @@ -317,17 +317,17 @@ attaching = TRUE update_icon() to_chat(target, SPAN_DANGER("[user] is trying to attach \the [src] to you!")) - user.visible_message(SPAN_WARNING("[user] starts setting up \the [src]'s needle on [target]'s arm."), \ + user.visible_message(SPAN_WARNING("[user] starts setting up \the [src]'s needle on [target]'s arm."), SPAN_WARNING("You start setting up \the [src]'s needle on [target]'s arm.")) if(!do_after(user, attach_time, INTERRUPT_ALL, BUSY_ICON_FRIENDLY, target, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) - user.visible_message(SPAN_WARNING("[user] stops setting up \the [src]'s needle on [target]'s arm."), \ + user.visible_message(SPAN_WARNING("[user] stops setting up \the [src]'s needle on [target]'s arm."), SPAN_WARNING("You stop setting up \the [src]'s needle on [target]'s arm.")) visible_message("\The [src]'s tubing snaps back onto the machine frame.") attaching = FALSE update_icon() return - user.visible_message("[user] attaches \the [src] to [target].", \ + user.visible_message("[user] attaches \the [src] to [target].", "You attach \the [src] to [target].") attached = target filtering = TRUE diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm index 907f5e37d3ec..52aa4ce1fe1f 100644 --- a/code/game/objects/items/tools/maintenance_tools.dm +++ b/code/game/objects/items/tools/maintenance_tools.dm @@ -159,8 +159,8 @@ /obj/item/tool/wirecutters/attack(mob/living/carbon/C, mob/user) if((C.handcuffed) && (istype(C.handcuffed, /obj/item/restraint/adjustable/cable))) - user.visible_message("\The [usr] cuts \the [C]'s restraints with \the [src]!",\ - "You cut \the [C]'s restraints with \the [src]!",\ + user.visible_message("\The [usr] cuts \the [C]'s restraints with \the [src]!", + "You cut \the [C]'s restraints with \the [src]!", "You hear cable being cut.") C.handcuffed = null C.handcuff_update() @@ -259,7 +259,7 @@ if(limb.brute_dam && welding) remove_fuel(1,user) if(self_fixing) - user.visible_message(SPAN_WARNING("\The [user] begins fixing some dents on their [limb.display_name]."), \ + user.visible_message(SPAN_WARNING("\The [user] begins fixing some dents on their [limb.display_name]."), SPAN_WARNING("You begin to carefully patch some dents on your [limb.display_name] so as not to void your warranty.")) if(!do_after(user, 30, INTERRUPT_ALL, BUSY_ICON_FRIENDLY)) return @@ -267,7 +267,7 @@ limb.heal_damage(15, 0, TRUE) human.pain.recalculate_pain() human.UpdateDamageIcon() - user.visible_message(SPAN_WARNING("\The [user] patches some dents on \the [human]'s [limb.display_name] with \the [src]."), \ + user.visible_message(SPAN_WARNING("\The [user] patches some dents on \the [human]'s [limb.display_name] with \the [src]."), SPAN_WARNING("You patch some dents on \the [human]'s [limb.display_name] with \the [src].")) return else @@ -285,7 +285,7 @@ if(!welding) target.reagents.trans_to(src, max_fuel) weld_tick = 0 - user.visible_message(SPAN_NOTICE("[user] refills [src]."), \ + user.visible_message(SPAN_NOTICE("[user] refills [src]."), SPAN_NOTICE("You refill [src].")) playsound(src.loc, 'sound/effects/refill.ogg', 25, 1, 3) else @@ -626,13 +626,13 @@ if(requires_skills_unbolt) if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_MASTER)) //Engi 3 is much faster - user.visible_message(SPAN_DANGER("[user] begins to search for [attacked_door]'s bolts!"),\ + user.visible_message(SPAN_DANGER("[user] begins to search for [attacked_door]'s bolts!"), SPAN_NOTICE("You search for [attacked_door]'s bolts.")) if(!do_after(user, unskilled_unbolt_time, INTERRUPT_ALL, BUSY_ICON_HOSTILE, src, INTERRUPT_ALL)) //Otherwise it takes an extra 15 seconds to_chat(user, SPAN_WARNING("You fail to find the bolts on [attacked_door].")) return - user.visible_message(SPAN_DANGER("[user] begins to disable [attacked_door]'s bolts!"),\ + user.visible_message(SPAN_DANGER("[user] begins to disable [attacked_door]'s bolts!"), SPAN_NOTICE("You start to disable [attacked_door]'s bolts.")) playsound(attacked_door, "pry", 25, TRUE) @@ -640,7 +640,7 @@ to_chat(user, SPAN_WARNING("You decide not to disable the bolts on [attacked_door].")) return - user.visible_message(SPAN_DANGER("[user] disables the bolts on [attacked_door]."),\ + user.visible_message(SPAN_DANGER("[user] disables the bolts on [attacked_door]."), SPAN_NOTICE("You unbolt [attacked_door].")) attacked_door.unlock(TRUE) return diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm index 8c9c5d344360..4cad1b4edc1e 100644 --- a/code/game/objects/items/tools/misc_tools.dm +++ b/code/game/objects/items/tools/misc_tools.dm @@ -72,7 +72,7 @@ to_chat(user, SPAN_WARNING("It already has the same label.")) return - user.visible_message(SPAN_NOTICE("[user] labels [A] as \"[label]\"."), \ + user.visible_message(SPAN_NOTICE("[user] labels [A] as \"[label]\"."), SPAN_NOTICE("You label [A] as \"[label]\".")) log_admin("[user] has labeled [A.name] with label \"[label]\". (CKEY: ([user.ckey]))") @@ -112,7 +112,7 @@ /obj/item/tool/hand_labeler/proc/remove_label(atom/A, mob/user) var/datum/component/label/label = A.GetComponent(/datum/component/label) if(label) - user.visible_message(SPAN_NOTICE("[user] removes label from [A]."), \ + user.visible_message(SPAN_NOTICE("[user] removes label from [A]."), SPAN_NOTICE("You remove the label from [A].")) label.remove_label() log_admin("[user] has removed label from [A.name]. (CKEY: ([user.ckey]))") diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 5d5c7030da0d..1e2c9c49c127 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -380,8 +380,8 @@ else if(sides == 20 && result == 1) comment = "Ouch, bad luck." icon_state = "[name][result]" - user.visible_message(SPAN_NOTICE("[user] has thrown [src]. It lands on [result]. [comment]"), \ - SPAN_NOTICE("You throw [src]. It lands on a [result]. [comment]"), \ + user.visible_message(SPAN_NOTICE("[user] has thrown [src]. It lands on [result]. [comment]"), + SPAN_NOTICE("You throw [src]. It lands on a [result]. [comment]"), SPAN_NOTICE("You hear [src] landing on a [result]. [comment]")) /obj/item/toy/bikehorn diff --git a/code/game/objects/items/weapons/blades.dm b/code/game/objects/items/weapons/blades.dm index 180239335380..bb91e5c4fccf 100644 --- a/code/game/objects/items/weapons/blades.dm +++ b/code/game/objects/items/weapons/blades.dm @@ -183,7 +183,7 @@ to_chat(user, SPAN_NOTICE("You were interrupted!")) return else - user.visible_message(SPAN_NOTICE("[user] starts checking \his body for shrapnel."), \ + user.visible_message(SPAN_NOTICE("[user] starts checking \his body for shrapnel."), SPAN_NOTICE("You begin searching your body for shrapnel.")) address_mode = "out of your" if(!do_after(embedded_human, 20, INTERRUPT_ALL, BUSY_ICON_FRIENDLY)) diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index d667c6df83de..15edfe7da065 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -71,8 +71,8 @@ on = !on if(on) - user.visible_message(SPAN_DANGER("With a flick of the wrist, [user] extends \his [src]."),\ - SPAN_DANGER("You extend \the [src]."),\ + user.visible_message(SPAN_DANGER("With a flick of the wrist, [user] extends \his [src]."), + SPAN_DANGER("You extend \the [src]."), "You hear an ominous click.") icon_state = "telebaton_1" item_state = "telebaton_1" @@ -81,8 +81,8 @@ stun_force = 40 attack_verb = list("smacked", "struck", "slapped", "beat") else - user.visible_message(SPAN_NOTICE("Using a smooth, practiced movement, [user] collapses \his [src]."),\ - SPAN_NOTICE("You collapse \the [src]."),\ + user.visible_message(SPAN_NOTICE("Using a smooth, practiced movement, [user] collapses \his [src]."), + SPAN_NOTICE("You collapse \the [src]."), "You hear a click.") icon_state = "telebaton_0" item_state = "telebaton_0" @@ -125,10 +125,10 @@ var/target_zone = check_zone(user.zone_selected) target.apply_stamina_damage(final_stun_force, target_zone, ARMOR_MELEE) if(target.stamina.current_stamina <= 0) - user.visible_message(SPAN_DANGER("[user] knocks down [target] with \the [src]!"),\ + user.visible_message(SPAN_DANGER("[user] knocks down [target] with \the [src]!"), SPAN_WARNING("You knock down [target] with \the [src]!")) else - user.visible_message(SPAN_DANGER("[user] thwacks [target] with \the [src]!"),\ + user.visible_message(SPAN_DANGER("[user] thwacks [target] with \the [src]!"), SPAN_WARNING("You beat [target] with \the [src]!")) return TRUE diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 16a57a4cfad1..f5de7ce31fbf 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -272,7 +272,7 @@ var/used_verb = "attacked" if(LAZYLEN(attack_verb)) used_verb = pick(attack_verb) - user.visible_message(SPAN_DANGER("[M] has been [used_verb] with [src][showname]."),\ + user.visible_message(SPAN_DANGER("[M] has been [used_verb] with [src][showname]."), SPAN_DANGER("You [used_verb] [M] with [src]."), null, 5) playsound(loc, 'sound/weapons/bladeslice.ogg', 25, 1) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 8baeb973337b..604fc275e505 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -257,14 +257,14 @@ if(buckled_mob) if(buckled_mob.buckled == src) if(buckled_mob != user) - buckled_mob.visible_message(\ - SPAN_NOTICE("[buckled_mob.name] was unbuckled by [user.name]!"),\ - SPAN_NOTICE("You were unbuckled from [src] by [user.name]."),\ + buckled_mob.visible_message( + SPAN_NOTICE("[buckled_mob.name] was unbuckled by [user.name]!"), + SPAN_NOTICE("You were unbuckled from [src] by [user.name]."), SPAN_NOTICE("You hear metal clanking.")) else - buckled_mob.visible_message(\ - SPAN_NOTICE("[buckled_mob.name] unbuckled [buckled_mob.p_them()]self!"),\ - SPAN_NOTICE("You unbuckle yourself from [src]."),\ + buckled_mob.visible_message( + SPAN_NOTICE("[buckled_mob.name] unbuckled [buckled_mob.p_them()]self!"), + SPAN_NOTICE("You unbuckle yourself from [src]."), SPAN_NOTICE("You hear metal clanking")) unbuckle(buckled_mob) add_fingerprint(user) @@ -325,14 +325,14 @@ /obj/proc/send_buckling_message(mob/M, mob/user) if (M == user) - M.visible_message(\ - SPAN_NOTICE("[M] buckles in!"),\ - SPAN_NOTICE("You buckle yourself to [src]."),\ + M.visible_message( + SPAN_NOTICE("[M] buckles in!"), + SPAN_NOTICE("You buckle yourself to [src]."), SPAN_NOTICE("You hear metal clanking.")) else - M.visible_message(\ - SPAN_NOTICE("[M] is buckled in to [src] by [user]!"),\ - SPAN_NOTICE("You are buckled in to [src] by [user]."),\ + M.visible_message( + SPAN_NOTICE("[M] is buckled in to [src] by [user]!"), + SPAN_NOTICE("You are buckled in to [src] by [user]."), SPAN_NOTICE("You hear metal clanking")) /obj/Move(NewLoc, direct) diff --git a/code/game/objects/structures/barricade/deployable.dm b/code/game/objects/structures/barricade/deployable.dm index 9535d6396ae9..7963fa3c3566 100644 --- a/code/game/objects/structures/barricade/deployable.dm +++ b/code/game/objects/structures/barricade/deployable.dm @@ -34,7 +34,7 @@ if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) to_chat(user, SPAN_WARNING("You do not know how to collapse [src] using a crowbar...")) return - user.visible_message(SPAN_NOTICE("[user] starts collapsing [src]."), \ + user.visible_message(SPAN_NOTICE("[user] starts collapsing [src]."), SPAN_NOTICE("You begin collapsing [src]...")) playsound(loc, 'sound/items/Crowbar.ogg', 25, 1) if(do_after(user, 1.5 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY, src)) diff --git a/code/game/objects/structures/barricade/sandbags.dm b/code/game/objects/structures/barricade/sandbags.dm index 0e2b77b4c1e5..c4edc9e108e3 100644 --- a/code/game/objects/structures/barricade/sandbags.dm +++ b/code/game/objects/structures/barricade/sandbags.dm @@ -71,7 +71,7 @@ if(istype(W, /obj/item/tool/shovel) && user.a_intent != INTENT_HARM) var/obj/item/tool/shovel/ET = W if(!ET.folded) - user.visible_message(SPAN_NOTICE("[user] starts disassembling [src]."), \ + user.visible_message(SPAN_NOTICE("[user] starts disassembling [src]."), SPAN_NOTICE("You start disassembling [src].")) if(do_after(user, ET.shovelspeed * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) user.visible_message(SPAN_NOTICE("[user] disassembles [src]."), @@ -87,7 +87,7 @@ to_chat(user, SPAN_WARNING("You can't stack more on [src].")) return - user.visible_message(SPAN_NOTICE("[user] starts adding more [SB] to [src]."), \ + user.visible_message(SPAN_NOTICE("[user] starts adding more [SB] to [src]."), SPAN_NOTICE("You start adding sandbags to [src].")) for(var/i = build_stage to BARRICADE_SANDBAG_5) if(build_stage >= BARRICADE_SANDBAG_5 || !do_after(user, 5, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY, src) || build_stage >= BARRICADE_SANDBAG_5 || SB.amount == 0) @@ -95,7 +95,7 @@ SB.use(1) increment_build_stage() update_icon() - user.visible_message(SPAN_NOTICE("[user] finishes stacking [SB] onto [src]."), \ + user.visible_message(SPAN_NOTICE("[user] finishes stacking [SB] onto [src]."), SPAN_NOTICE("You stack [SB] onto [src].")) return else diff --git a/code/game/objects/structures/bookcase.dm b/code/game/objects/structures/bookcase.dm index b8e027a948ae..89a3b3827bea 100644 --- a/code/game/objects/structures/bookcase.dm +++ b/code/game/objects/structures/bookcase.dm @@ -47,7 +47,7 @@ else if(HAS_TRAIT(O, TRAIT_TOOL_WRENCH)) playsound(loc, 'sound/items/Ratchet.ogg', 25, 1) if(do_after(user, 1 SECONDS, INTERRUPT_MOVED, BUSY_ICON_FRIENDLY, src)) - user.visible_message("[user] deconstructs [src].", \ + user.visible_message("[user] deconstructs [src].", "You deconstruct [src].", "You hear a noise.") deconstruct(FALSE) else diff --git a/code/game/objects/structures/cargo_container.dm b/code/game/objects/structures/cargo_container.dm index 4070fa61de0d..d71aa6b937d6 100644 --- a/code/game/objects/structures/cargo_container.dm +++ b/code/game/objects/structures/cargo_container.dm @@ -27,7 +27,7 @@ xenomorph.animation_attack_on(src) - xenomorph.visible_message(SPAN_DANGER("[xenomorph] slashes [src]!"), \ + xenomorph.visible_message(SPAN_DANGER("[xenomorph] slashes [src]!"), SPAN_DANGER("You slash [src]!")) update_health(damage) @@ -210,13 +210,13 @@ var/mob/living/carbon/human/H = user if(H.species.can_shred(H)) - user.visible_message(SPAN_WARNING("[user] smashes [src] to no avail."), \ - SPAN_WARNING("You beat against [src] to no effect"), \ + user.visible_message(SPAN_WARNING("[user] smashes [src] to no avail."), + SPAN_WARNING("You beat against [src] to no effect"), "You hear twisting metal.") if(!damage_dealt) - user.visible_message(SPAN_WARNING("[user] beats against the [src] to no avail."), \ - SPAN_WARNING("[user] beats against the [src]."), \ + user.visible_message(SPAN_WARNING("[user] beats against the [src] to no avail."), + SPAN_WARNING("[user] beats against the [src]."), "You hear twisting metal.") /obj/structure/cargo_container/horizontal diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index df731e433bc1..1e9f4c131178 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -40,7 +40,7 @@ /obj/structure/largecrate/attackby(obj/item/W as obj, mob/user as mob) if(HAS_TRAIT(W, TRAIT_TOOL_CROWBAR)) unpack() - user.visible_message(SPAN_NOTICE("[user] pries \the [src] open."), \ + user.visible_message(SPAN_NOTICE("[user] pries \the [src] open."), SPAN_NOTICE("You pry open \the [src].")) else return attack_hand(user) @@ -48,7 +48,7 @@ /obj/structure/largecrate/attack_alien(mob/living/carbon/xenomorph/M) M.animation_attack_on(src) unpack() - M.visible_message(SPAN_DANGER("[M] smashes [src] apart!"), \ + M.visible_message(SPAN_DANGER("[M] smashes [src] apart!"), SPAN_DANGER("You smash [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index 337a27ba33c1..bf8d4b9fa9ef 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -23,7 +23,7 @@ /obj/structure/curtain/attack_alien(mob/living/carbon/xenomorph/M) M.animation_attack_on(src) - M.visible_message(SPAN_DANGER("\The [M] slices [src] apart!"), \ + M.visible_message(SPAN_DANGER("\The [M] slices [src] apart!"), SPAN_DANGER("You slice [src] apart!"), null, 5) qdel(src) return XENO_ATTACK_ACTION diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index b40439a3bfa6..10ecfa1d7c43 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -69,13 +69,13 @@ var/mob/living/carbon/human/H = user if(H.species.can_shred(H)) damage_dealt = 5 - user.visible_message(SPAN_WARNING("[user] mangles [src]."), \ - SPAN_WARNING("You mangle [src]."), \ + user.visible_message(SPAN_WARNING("[user] mangles [src]."), + SPAN_WARNING("You mangle [src]."), "You hear twisting metal.") if(!damage_dealt) - user.visible_message(SPAN_WARNING("[user] kicks [src]."), \ - SPAN_WARNING("You kick [src]."), \ + user.visible_message(SPAN_WARNING("[user] kicks [src]."), + SPAN_WARNING("You kick [src]."), "You hear twisting metal.") if(shock(user, 70)) @@ -91,8 +91,8 @@ if(M.melee_damage_upper == 0) return playsound(loc, 'sound/effects/grillehit.ogg', 25, 1) - M.visible_message(SPAN_WARNING("[M] smashes against [src]."), \ - SPAN_WARNING("You smash against [src]."), \ + M.visible_message(SPAN_WARNING("[M] smashes against [src]."), + SPAN_WARNING("You smash against [src]."), "You hear twisting metal.") health -= M.melee_damage_upper @@ -126,7 +126,7 @@ if(!shock(user, 90)) playsound(loc, 'sound/items/Screwdriver.ogg', 25, 1) anchored = !anchored - user.visible_message(SPAN_NOTICE("[user] [anchored ? "fastens" : "unfastens"] the grille."), \ + user.visible_message(SPAN_NOTICE("[user] [anchored ? "fastens" : "unfastens"] the grille."), SPAN_NOTICE("You have [anchored ? "fastened the grille to" : "unfastened the grill from"] the floor.")) return diff --git a/code/game/objects/structures/hybrisa_props.dm b/code/game/objects/structures/hybrisa_props.dm index 94dc26bef9df..132548031678 100644 --- a/code/game/objects/structures/hybrisa_props.dm +++ b/code/game/objects/structures/hybrisa_props.dm @@ -20,10 +20,10 @@ take_damage( rand(user.melee_damage_lower, user.melee_damage_upper) * brute_multiplier) playsound(src, 'sound/effects/metalscrape.ogg', 20, 1) if(health <= 0) - user.visible_message(SPAN_DANGER("[user] slices [src] apart!"), \ + user.visible_message(SPAN_DANGER("[user] slices [src] apart!"), SPAN_DANGER("We slice [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) else - user.visible_message(SPAN_DANGER("[user] [user.slashes_verb] [src]!"), \ + user.visible_message(SPAN_DANGER("[user] [user.slashes_verb] [src]!"), SPAN_DANGER("We [user.slash_verb] [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) update_icon() return XENO_ATTACK_ACTION diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 3d8051c6c9fc..0788d471ef34 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -98,7 +98,7 @@ if(tmp_label == "" || !tmp_label) if(labelcomponent) labelcomponent.remove_label() - user.visible_message(SPAN_NOTICE("[user] removes the label from \the [src]."), \ + user.visible_message(SPAN_NOTICE("[user] removes the label from \the [src]."), SPAN_NOTICE("You remove the label from \the [src].")) return else @@ -106,7 +106,7 @@ if(length(tmp_label) > MAX_NAME_LEN) to_chat(user, SPAN_WARNING("The label can be at most [MAX_NAME_LEN] characters long.")) else - user.visible_message(SPAN_NOTICE("[user] labels [src] as \"[tmp_label]\"."), \ + user.visible_message(SPAN_NOTICE("[user] labels [src] as \"[tmp_label]\"."), SPAN_NOTICE("You label [src] as \"[tmp_label]\".")) AddComponent(/datum/component/label, tmp_label) playsound(src, "paper_writing", 15, TRUE) diff --git a/code/game/objects/structures/pipes/vents/vents.dm b/code/game/objects/structures/pipes/vents/vents.dm index e9e7afd62577..d5f071b4dfd8 100644 --- a/code/game/objects/structures/pipes/vents/vents.dm +++ b/code/game/objects/structures/pipes/vents/vents.dm @@ -77,21 +77,21 @@ weldtime = 60 var/obj/item/tool/weldingtool/WT = W if(WT.remove_fuel(1, user)) - user.visible_message(SPAN_NOTICE("[user] starts welding \the [src] with \the [WT]."), \ + user.visible_message(SPAN_NOTICE("[user] starts welding \the [src] with \the [WT]."), SPAN_NOTICE("You start welding \the [src] with \the [WT].")) playsound(loc, 'sound/items/weldingtool_weld.ogg', 25) if(do_after(user, weldtime * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) if(!src || !WT.isOn()) return 0 playsound(get_turf(src), 'sound/items/Welder2.ogg', 25, 1) if(!welded) - user.visible_message(SPAN_NOTICE("[user] welds \the [src] shut."), \ + user.visible_message(SPAN_NOTICE("[user] welds \the [src] shut."), SPAN_NOTICE("You weld \the [src] shut.")) welded = 1 update_icon() msg_admin_niche("[key_name(user)] welded a vent pump.") return 1 else - user.visible_message(SPAN_NOTICE("[user] welds \the [src] open."), \ + user.visible_message(SPAN_NOTICE("[user] welds \the [src] open."), SPAN_NOTICE("You weld \the [src] open.")) welded = 0 msg_admin_niche("[key_name(user)] un-welded a vent pump.") diff --git a/code/game/objects/structures/platforms.dm b/code/game/objects/structures/platforms.dm index 2835004a1e23..23ef998bf7f2 100644 --- a/code/game/objects/structures/platforms.dm +++ b/code/game/objects/structures/platforms.dm @@ -93,7 +93,7 @@ if(user.pulling) if(!can_climb(user)) return - user.visible_message(SPAN_WARNING("[user] starts dragging \the [user.pulling] onto \the [src]"),\ + user.visible_message(SPAN_WARNING("[user] starts dragging \the [user.pulling] onto \the [src]"), SPAN_WARNING("You start dragging \the [user.pulling] onto \the [src].")) if(!do_after(user, 3 SECONDS * user.get_skill_duration_multiplier(SKILL_FIREMAN), INTERRUPT_ALL, BUSY_ICON_HOSTILE, user.pulling, INTERRUPT_MOVED, BUSY_ICON_HOSTILE)) return @@ -101,7 +101,7 @@ if(!can_climb(user)) return var/turf/move_to_turf = get_step(get_turf(src), dir) - user.visible_message(SPAN_WARNING("[user] finishes dragging \the [user.pulling] onto \the [src]"),\ + user.visible_message(SPAN_WARNING("[user] finishes dragging \the [user.pulling] onto \the [src]"), SPAN_WARNING("You finish dragging \the [user.pulling] onto \the [src].")) user.pulling.forceMove(move_to_turf) @@ -119,7 +119,7 @@ to_chat(user, SPAN_WARNING("Its too strong for us!")) return XENO_NO_DELAY_ACTION - user.visible_message(SPAN_WARNING("[user] begins to lean against [src]."), \ + user.visible_message(SPAN_WARNING("[user] begins to lean against [src]."), SPAN_WARNING("You start to stomp and pressure [src]."), null, 5, CHAT_TYPE_XENO_COMBAT) playsound(loc, creaking_sound, 30, 1) @@ -141,7 +141,7 @@ if(!do_after(user, shove_time, INTERRUPT_ALL, BUSY_ICON_HOSTILE, numticks = shove_time * 0.1)) return user.animation_attack_on(src) - user.visible_message(SPAN_DANGER("[user] collapses [src] down!"), \ + user.visible_message(SPAN_DANGER("[user] collapses [src] down!"), SPAN_DANGER("You collapse [src] down!"), null, 5, CHAT_TYPE_XENO_COMBAT) playsound(loc, breaking_sound, 25, 1) broken() diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm index 9add9f5a862b..2a25eb1ccd65 100644 --- a/code/game/objects/structures/props.dm +++ b/code/game/objects/structures/props.dm @@ -1044,13 +1044,13 @@ var/message = sanitize(input(user, "What do you write on [src]?", "Inscription")) if(!message) return - user.visible_message(SPAN_NOTICE("[user] begins to [action_msg] [src]."),\ + user.visible_message(SPAN_NOTICE("[user] begins to [action_msg] [src]."), SPAN_NOTICE("You begin to [action_msg] [src]."), null, 4) if(!do_after(user, length(message) * time_multiplier, INTERRUPT_ALL, BUSY_ICON_GENERIC)) to_chat(user, SPAN_WARNING("You were interrupted!")) else - user.visible_message(SPAN_NOTICE("[user] uses \his [W.name] to [action_msg] [src]."),\ + user.visible_message(SPAN_NOTICE("[user] uses \his [W.name] to [action_msg] [src]."), SPAN_NOTICE("You [action_msg] [src] with your [W.name]."), null, 4) if(inscription) inscription += "\n[message]" @@ -1076,10 +1076,10 @@ update_health(rand(M.melee_damage_lower, M.melee_damage_upper)) playsound(src, 'sound/effects/woodhit.ogg', 25, 1) if(health <= 0) - M.visible_message(SPAN_DANGER("[M] slices [src] apart!"), \ + M.visible_message(SPAN_DANGER("[M] slices [src] apart!"), SPAN_DANGER("You slice [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) else - M.visible_message(SPAN_DANGER("[M] slashes [src]!"), \ + M.visible_message(SPAN_DANGER("[M] slashes [src]!"), SPAN_DANGER("You slash [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION diff --git a/code/game/objects/structures/reagent_dispensers.dm b/code/game/objects/structures/reagent_dispensers.dm index 24b95e600ef2..b38e92e28118 100644 --- a/code/game/objects/structures/reagent_dispensers.dm +++ b/code/game/objects/structures/reagent_dispensers.dm @@ -252,7 +252,7 @@ to_chat(user, SPAN_WARNING("You don't have enough of [M] to reinforce [src].")) return - user.visible_message(SPAN_NOTICE("[user] begins reinforcing the exterior of [src] with [M]."),\ + user.visible_message(SPAN_NOTICE("[user] begins reinforcing the exterior of [src] with [M]."), SPAN_NOTICE("You begin reinforcing [src] with [M].")) if(!do_after(user, 3 SECONDS, INTERRUPT_ALL, BUSY_ICON_BUILD, src, INTERRUPT_ALL) || reinforced) @@ -262,7 +262,7 @@ to_chat(user, SPAN_WARNING("You don't have enough of [M] to reinforce [src].")) return - user.visible_message(SPAN_NOTICE("[user] reinforces the exterior of [src] with [M]."),\ + user.visible_message(SPAN_NOTICE("[user] reinforces the exterior of [src] with [M]."), SPAN_NOTICE("You reinforce [src] with [M].")) reinforced = TRUE @@ -270,13 +270,13 @@ else if(HAS_TRAIT(W, TRAIT_TOOL_CROWBAR)) - user.visible_message(SPAN_DANGER("[user] begins to remove the shielding from [src]."),\ + user.visible_message(SPAN_DANGER("[user] begins to remove the shielding from [src]."), SPAN_NOTICE("You begin to remove the shielding from [src].")) if(!do_after(user, 3 SECONDS, INTERRUPT_ALL, BUSY_ICON_BUILD, src, INTERRUPT_ALL) || !reinforced) return - user.visible_message(SPAN_DANGER("[user] removes the shielding from [src]."),\ + user.visible_message(SPAN_DANGER("[user] removes the shielding from [src]."), SPAN_NOTICE("You remove the shielding from [src].")) new /obj/item/stack/sheet/plasteel(loc, STACK_10) diff --git a/code/game/objects/structures/sink.dm b/code/game/objects/structures/sink.dm index e04c60eaf450..a404653d5d3d 100644 --- a/code/game/objects/structures/sink.dm +++ b/code/game/objects/structures/sink.dm @@ -73,8 +73,8 @@ user.stuttering = 10 user.apply_effect(10, WEAKEN) B.deductcharge(B.hitcost) - user.visible_message( \ - SPAN_DANGER("[user] was stunned by \his wet [O]!"), \ + user.visible_message( + SPAN_DANGER("[user] was stunned by \his wet [O]!"), SPAN_DANGER("You were stunned by your wet [O]!")) return @@ -95,8 +95,8 @@ if(user.get_active_hand() != I) return //Person has switched hands or the item in their hands O.clean_blood() - user.visible_message( \ - SPAN_NOTICE("[user] washes \a [I] using \the [src]."), \ + user.visible_message( + SPAN_NOTICE("[user] washes \a [I] using \the [src]."), SPAN_NOTICE("You wash \a [I] using \the [src].")) diff --git a/code/game/objects/structures/stool_bed_chair_nest/janicart.dm b/code/game/objects/structures/stool_bed_chair_nest/janicart.dm index 15baa15aa1a4..a90f198a7f68 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/janicart.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/janicart.dm @@ -71,8 +71,8 @@ /obj/structure/bed/chair/janicart/send_buckling_message(mob/M, mob/user) - M.visible_message(\ - SPAN_NOTICE("[M] climbs onto the [callme]!"),\ + M.visible_message( + SPAN_NOTICE("[M] climbs onto the [callme]!"), SPAN_NOTICE("You climb onto the [callme]!")) diff --git a/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm b/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm index a38c7a89b56d..7e440ec728df 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm @@ -135,7 +135,7 @@ health = max(0, health - W.force) playsound(loc, "alien_resin_break", 25) user.animation_attack_on(src) - user.visible_message(SPAN_WARNING("\The [user] hits \the [src] with \the [W]!"), \ + user.visible_message(SPAN_WARNING("\The [user] hits \the [src] with \the [W]!"), SPAN_WARNING("You hit \the [src] with \the [W]!")) healthcheck() @@ -172,8 +172,8 @@ user.visible_message(SPAN_NOTICE("\The [user] starts pulling \the [buckled_mob] free from the resin binding them in place..."), SPAN_NOTICE("You start pulling \the [buckled_mob] free from the resin binding them in place...")) if(!do_after(user, 8 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_HOSTILE)) return - buckled_mob.visible_message(SPAN_NOTICE("\The [user] pulls \the [buckled_mob] free from \the [src]!"),\ - SPAN_NOTICE("\The [user] pulls you free from \the [src]."),\ + buckled_mob.visible_message(SPAN_NOTICE("\The [user] pulls \the [buckled_mob] free from \the [src]!"), + SPAN_NOTICE("\The [user] pulls you free from \the [src]."), SPAN_NOTICE("You hear squelching.")) playsound(loc, "alien_resin_move", 50) if(ishuman(buckled_mob)) @@ -265,8 +265,8 @@ return TRUE /obj/structure/bed/nest/send_buckling_message(mob/M, mob/user) - M.visible_message(SPAN_XENONOTICE("[user] secretes a thick, vile resin, securing [M] into [src]!"), \ - SPAN_XENONOTICE("[user] drenches you in a foul-smelling resin, trapping you in [src]!"), \ + M.visible_message(SPAN_XENONOTICE("[user] secretes a thick, vile resin, securing [M] into [src]!"), + SPAN_XENONOTICE("[user] drenches you in a foul-smelling resin, trapping you in [src]!"), SPAN_NOTICE("You hear squelching.")) playsound(loc, "alien_resin_move", 50) @@ -320,7 +320,7 @@ return if(M.a_intent == INTENT_HARM && !buckled_mob) //can't slash nest with an occupant. M.animation_attack_on(src) - M.visible_message(SPAN_DANGER("\The [M] claws at \the [src]!"), \ + M.visible_message(SPAN_DANGER("\The [M] claws at \the [src]!"), SPAN_DANGER("We claw at \the [src].")) playsound(loc, "alien_resin_break", 25) health -= (M.melee_damage_upper + 25) //Beef up the damage a bit @@ -331,7 +331,7 @@ return XENO_NONCOMBAT_ACTION /obj/structure/bed/nest/attack_animal(mob/living/M as mob) - M.visible_message(SPAN_DANGER("\The [M] tears at \the [src]!"), \ + M.visible_message(SPAN_DANGER("\The [M] tears at \the [src]!"), SPAN_DANGER("You tear at \the [src].")) playsound(loc, "alien_resin_break", 25) health -= 40 diff --git a/code/game/objects/structures/window_frame.dm b/code/game/objects/structures/window_frame.dm index a21ad8aab724..42570941dc82 100644 --- a/code/game/objects/structures/window_frame.dm +++ b/code/game/objects/structures/window_frame.dm @@ -88,11 +88,11 @@ if(sheet.get_amount() < 2) to_chat(user, SPAN_WARNING("You need more [W.name] to install a new window.")) return - user.visible_message(SPAN_NOTICE("[user] starts installing a new glass window on the frame."), \ + user.visible_message(SPAN_NOTICE("[user] starts installing a new glass window on the frame."), SPAN_NOTICE("You start installing a new window on the frame.")) playsound(src, 'sound/items/Deconstruct.ogg', 25, 1) if(do_after(user, 20 * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) - user.visible_message(SPAN_NOTICE("[user] installs a new glass window on the frame."), \ + user.visible_message(SPAN_NOTICE("[user] installs a new glass window on the frame."), SPAN_NOTICE("You install a new window on the frame.")) sheet.use(2) new window_type(loc) //This only works on Almayer windows! diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 5066866e6028..789bbd12d56c 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -82,7 +82,7 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new()) return collide_message_busy = world.time + 3 SECONDS - C.visible_message(SPAN_NOTICE("[C] tries to go through \the [src]."), \ + C.visible_message(SPAN_NOTICE("[C] tries to go through \the [src]."), SPAN_NOTICE("You try to go through \the [src].")) if(do_after(C, 2 SECONDS, INTERRUPT_ALL, BUSY_ICON_GENERIC)) diff --git a/code/game/turfs/light.dm b/code/game/turfs/light.dm index e8b7038bcb51..ebd0d3b8e129 100644 --- a/code/game/turfs/light.dm +++ b/code/game/turfs/light.dm @@ -90,8 +90,8 @@ if(!broken) playsound(src, "windowshatter", 25, 1) xeno_attacker.animation_attack_on(src) - xeno_attacker.visible_message(SPAN_DANGER("\The [xeno_attacker] smashes \the [src]!"), \ - SPAN_DANGER("You smash \the [src]!"), \ + xeno_attacker.visible_message(SPAN_DANGER("\The [xeno_attacker] smashes \the [src]!"), + SPAN_DANGER("You smash \the [src]!"), SPAN_DANGER("You hear broken glass!"), 5) broken = TRUE update_icon() diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm index f88498114ff0..de043b4fa2d6 100644 --- a/code/game/turfs/walls/wall_types.dm +++ b/code/game/turfs/walls/wall_types.dm @@ -1021,7 +1021,7 @@ return XENO_NO_DELAY_ACTION M.animation_attack_on(src) - M.visible_message(SPAN_XENONOTICE("\The [M] claws \the [src]!"), \ + M.visible_message(SPAN_XENONOTICE("\The [M] claws \the [src]!"), SPAN_XENONOTICE("You claw \the [src].")) playsound(src, "alien_resin_break", 25) if (M.hivenumber == hivenumber) @@ -1215,7 +1215,7 @@ ..() if(isxeno(AM)) return - visible_message(SPAN_DANGER("\The [src] was hit by \the [AM]."), \ + visible_message(SPAN_DANGER("\The [src] was hit by \the [AM]."), SPAN_DANGER("You hit \the [src].")) var/tforce = 0 if(ismob(AM)) @@ -1237,7 +1237,7 @@ return XENO_NO_DELAY_ACTION M.animation_attack_on(src) - M.visible_message(SPAN_XENONOTICE("\The [M] claws \the [src]!"), \ + M.visible_message(SPAN_XENONOTICE("\The [M] claws \the [src]!"), SPAN_XENONOTICE("We claw \the [src].")) playsound(src, "alien_resin_break", 25) if (M.hivenumber == hivenumber) @@ -1248,7 +1248,7 @@ /turf/closed/wall/resin/attack_animal(mob/living/M) - M.visible_message(SPAN_DANGER("[M] tears \the [src]!"), \ + M.visible_message(SPAN_DANGER("[M] tears \the [src]!"), SPAN_DANGER("You tear \the [name].")) playsound(src, "alien_resin_break", 25) M.animation_attack_on(src) diff --git a/code/modules/cm_aliens/Ovipositor.dm b/code/modules/cm_aliens/Ovipositor.dm index 358a8f70dc9a..6a58bcda9076 100644 --- a/code/modules/cm_aliens/Ovipositor.dm +++ b/code/modules/cm_aliens/Ovipositor.dm @@ -65,7 +65,7 @@ /obj/ovipositor/attack_alien(mob/living/carbon/xenomorph/M) switch(M.a_intent) if(INTENT_HELP) - M.visible_message(SPAN_NOTICE("\The [M] caresses [src] with its claws."), \ + M.visible_message(SPAN_NOTICE("\The [M] caresses [src] with its claws."), SPAN_NOTICE("You caress [src] with your claws.")) if(INTENT_GRAB) @@ -78,14 +78,14 @@ else M.animation_attack_on(src) var/damage = (rand(M.melee_damage_lower, M.melee_damage_upper) + 3) - M.visible_message(SPAN_DANGER("\The [M] bites [src]!"), \ + M.visible_message(SPAN_DANGER("\The [M] bites [src]!"), SPAN_DANGER("You bite [src]!")) health -= damage return XENO_ATTACK_ACTION /obj/ovipositor/attack_larva(mob/living/carbon/xenomorph/larva/M) - M.visible_message(SPAN_DANGER("[M] nudges its head against [src]."), \ + M.visible_message(SPAN_DANGER("[M] nudges its head against [src]."), SPAN_DANGER("You nudge your head against [src].")) // Density override diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm index aced4363125b..c9a4a34499b9 100644 --- a/code/modules/cm_aliens/XenoStructures.dm +++ b/code/modules/cm_aliens/XenoStructures.dm @@ -64,7 +64,7 @@ ..() if(istype(AM,/mob/living/carbon/xenomorph)) return - visible_message(SPAN_DANGER("\The [src] was hit by \the [AM]."), \ + visible_message(SPAN_DANGER("\The [src] was hit by \the [AM]."), SPAN_DANGER("You hit \the [src].")) var/tforce = 0 if(ismob(AM)) @@ -86,7 +86,7 @@ return XENO_NO_DELAY_ACTION else M.animation_attack_on(src) - M.visible_message(SPAN_XENONOTICE("\The [M] claws \the [src]!"), \ + M.visible_message(SPAN_XENONOTICE("\The [M] claws \the [src]!"), SPAN_XENONOTICE("We claw \the [src].")) if(istype(src, /obj/effect/alien/resin/sticky)) playsound(loc, "alien_resin_move", 25) @@ -103,7 +103,7 @@ return XENO_ATTACK_ACTION /obj/effect/alien/resin/attack_animal(mob/living/M as mob) - M.visible_message(SPAN_DANGER("[M] tears \the [src]!"), \ + M.visible_message(SPAN_DANGER("[M] tears \the [src]!"), SPAN_DANGER("You tear \the [name].")) if(istype(src, /obj/effect/alien/resin/sticky)) playsound(loc, "alien_resin_move", 25) @@ -852,7 +852,7 @@ /obj/effect/alien/resin/resin_pillar/attack_alien(mob/living/carbon/xenomorph/M) if(!brittle) M.animation_attack_on(src) - M.visible_message(SPAN_XENONOTICE("\The [M] claws \the [src], but the slash bounces off!"), \ + M.visible_message(SPAN_XENONOTICE("\The [M] claws \the [src], but the slash bounces off!"), SPAN_XENONOTICE("You claw \the [src], but the slash bounces off!")) return XENO_ATTACK_ACTION @@ -861,7 +861,7 @@ /obj/effect/alien/resin/resin_pillar/attackby(obj/item/W, mob/living/user) user.animation_attack_on(src) if(!brittle) - user.visible_message(SPAN_DANGER("[user] hits \the [src], but \the [W] bounces off!"), \ + user.visible_message(SPAN_DANGER("[user] hits \the [src], but \the [W] bounces off!"), SPAN_DANGER("You hit \the [name], but \the [W] bounces off!")) return diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index 698765d4edd0..c257c846ce6d 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -118,7 +118,7 @@ /obj/effect/alien/egg/attack_alien(mob/living/carbon/xenomorph/M) if(status == EGG_BURST || status == EGG_DESTROYED) M.animation_attack_on(src) - M.visible_message(SPAN_XENONOTICE("[M] clears the hatched egg."), \ + M.visible_message(SPAN_XENONOTICE("[M] clears the hatched egg."), SPAN_XENONOTICE("We clear the hatched egg.")) playsound(src.loc, "alien_resin_break", 25) qdel(src) @@ -264,7 +264,7 @@ switch(status) if(EGG_BURST) if(user) - visible_message(SPAN_XENOWARNING("[user] slides [F] back into [src]."), \ + visible_message(SPAN_XENOWARNING("[user] slides [F] back into [src]."), SPAN_XENONOTICE("We place the child back in to [src].")) user.temp_drop_inv_item(F) else diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index e0691b0d4d28..3b1be8da7b6a 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -70,7 +70,7 @@ to_chat(user, SPAN_XENOWARNING("\The [src] is full of children.")) return if(user) - visible_message(SPAN_XENOWARNING("[user] slides [hugger] back into \the [src]."), \ + visible_message(SPAN_XENOWARNING("[user] slides [hugger] back into \the [src]."), SPAN_XENONOTICE("You place the child back into \the [src].")) user.temp_drop_inv_item(hugger) else @@ -87,7 +87,7 @@ to_chat(user, SPAN_XENOWARNING("\The [src] is full of children.")) return if(user) - visible_message(SPAN_XENOWARNING("[user] slides a facehugger out of \the [egg] into \the [src]."), \ + visible_message(SPAN_XENOWARNING("[user] slides a facehugger out of \the [egg] into \the [src]."), SPAN_XENONOTICE("You place the child from an egg into \the [src].")) user.temp_drop_inv_item(egg) stored_huggers = min(huggers_max_amount, stored_huggers + 1) diff --git a/code/modules/cm_aliens/structures/special/recovery_node.dm b/code/modules/cm_aliens/structures/special/recovery_node.dm index a2af2c41acc1..e649a18f3032 100644 --- a/code/modules/cm_aliens/structures/special/recovery_node.dm +++ b/code/modules/cm_aliens/structures/special/recovery_node.dm @@ -26,7 +26,7 @@ if(!length(heal_candidates)) return var/mob/living/carbon/xenomorph/picked_candidate = pick(heal_candidates) - picked_candidate.visible_message(SPAN_HELPFUL("\The [picked_candidate] glows as a warm aura envelops them."), \ + picked_candidate.visible_message(SPAN_HELPFUL("\The [picked_candidate] glows as a warm aura envelops them."), SPAN_HELPFUL("You feel a warm aura envelop you.")) if(!do_after(picked_candidate, heal_cooldown, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) return diff --git a/code/modules/cm_aliens/structures/trap.dm b/code/modules/cm_aliens/structures/trap.dm index 482e61184fff..e3bbad63cebd 100644 --- a/code/modules/cm_aliens/structures/trap.dm +++ b/code/modules/cm_aliens/structures/trap.dm @@ -94,7 +94,7 @@ if(RESIN_TRAP_HUGGER) if(can_hug(AM, hivenumber) && !isyautja(AM) && !issynth(AM)) var/mob/living/L = AM - L.visible_message(SPAN_WARNING("[L] trips on [src]!"),\ + L.visible_message(SPAN_WARNING("[L] trips on [src]!"), SPAN_DANGER("You trip on [src]!")) L.apply_effect(1, WEAKEN) trigger_trap() @@ -265,7 +265,7 @@ playsound(loc, 'sound/effects/refill.ogg', 25, 1) set_state(RESIN_TRAP_GAS) cause_data = create_cause_data("resin gas trap", B) - B.visible_message(SPAN_XENOWARNING("\The [B] pressurises the resin trap with acid gas!"), \ + B.visible_message(SPAN_XENOWARNING("\The [B] pressurises the resin trap with acid gas!"), SPAN_XENOWARNING("You pressurise the resin trap with acid gas!"), null, 5) else //Non-boiler acid types @@ -297,7 +297,7 @@ else set_state(RESIN_TRAP_ACID1 + X.acid_level - 1) - X.visible_message(SPAN_XENOWARNING("\The [X] pressurises the resin trap with acid!"), \ + X.visible_message(SPAN_XENOWARNING("\The [X] pressurises the resin trap with acid!"), SPAN_XENOWARNING("You pressurise the resin trap with acid!"), null, 5) return XENO_NO_DELAY_ACTION diff --git a/code/modules/cm_aliens/structures/tunnel.dm b/code/modules/cm_aliens/structures/tunnel.dm index 15540ddccb2c..7e4d830ed359 100644 --- a/code/modules/cm_aliens/structures/tunnel.dm +++ b/code/modules/cm_aliens/structures/tunnel.dm @@ -192,7 +192,7 @@ . = FALSE //For peace of mind when it comes to dealing with unintended proc failures if(X in contents) X.forceMove(loc) - visible_message(SPAN_XENONOTICE("\The [X] pops out of the tunnel!"), \ + visible_message(SPAN_XENONOTICE("\The [X] pops out of the tunnel!"), SPAN_XENONOTICE("We pop out through the other side!")) return TRUE @@ -219,7 +219,7 @@ to_chat(M, SPAN_XENOWARNING("We aren't large enough to collapse this tunnel!")) return XENO_NO_DELAY_ACTION - M.visible_message(SPAN_XENODANGER("[M] begins to fill [src] with dirt."),\ + M.visible_message(SPAN_XENODANGER("[M] begins to fill [src] with dirt."), SPAN_XENONOTICE("We begin to fill [src] with dirt using our massive claws."), max_distance = 3) xeno_attack_delay(M) diff --git a/code/modules/cm_aliens/weeds.dm b/code/modules/cm_aliens/weeds.dm index 3c649c2c04d2..f8a463b5e5e4 100644 --- a/code/modules/cm_aliens/weeds.dm +++ b/code/modules/cm_aliens/weeds.dm @@ -363,7 +363,7 @@ /obj/effect/alien/weeds/attack_alien(mob/living/carbon/xenomorph/attacking_xeno) if(!explo_proof && !HIVE_ALLIED_TO_HIVE(attacking_xeno.hivenumber, hivenumber)) attacking_xeno.animation_attack_on(src) - attacking_xeno.visible_message(SPAN_DANGER("\The [attacking_xeno] slashes [src]!"), \ + attacking_xeno.visible_message(SPAN_DANGER("\The [attacking_xeno] slashes [src]!"), SPAN_DANGER("You slash [src]!"), null, 5) playsound(loc, "alien_resin_break", 25) take_damage(attacking_xeno.melee_damage_lower*WEED_XENO_DAMAGEMULT) diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index 6b2674f7541a..4689dce8e847 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -1105,7 +1105,7 @@ busy_winch = TRUE playsound(loc, 'sound/machines/medevac_extend.ogg', 40, 1) flick("medevac_system_active", src) - user.visible_message(SPAN_NOTICE("[user] activates [src]'s winch."), \ + user.visible_message(SPAN_NOTICE("[user] activates [src]'s winch."), SPAN_NOTICE("You activate [src]'s winch.")) sleep(30) @@ -1306,7 +1306,7 @@ busy_winch = TRUE playsound(loc, 'sound/machines/medevac_extend.ogg', 40, 1) flick("fulton_system_active", src) - user.visible_message(SPAN_NOTICE("[user] activates [src]'s winch."), \ + user.visible_message(SPAN_NOTICE("[user] activates [src]'s winch."), SPAN_NOTICE("You activate [src]'s winch.")) sleep(30) diff --git a/code/modules/cm_marines/equipment/mortar/mortars.dm b/code/modules/cm_marines/equipment/mortar/mortars.dm index 7ef86ab11ee4..56998010d19f 100644 --- a/code/modules/cm_marines/equipment/mortar/mortars.dm +++ b/code/modules/cm_marines/equipment/mortar/mortars.dm @@ -301,10 +301,10 @@ to_chat(user, SPAN_WARNING("[src]'s barrel is still steaming hot. Wait a few seconds and stop firing it.")) return playsound(loc, 'sound/items/Ratchet.ogg', 25, 1) - user.visible_message(SPAN_NOTICE("[user] starts undeploying [src]."), \ + user.visible_message(SPAN_NOTICE("[user] starts undeploying [src]."), SPAN_NOTICE("You start undeploying [src].")) if(do_after(user, 4 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) - user.visible_message(SPAN_NOTICE("[user] undeploys [src]."), \ + user.visible_message(SPAN_NOTICE("[user] undeploys [src]."), SPAN_NOTICE("You undeploy [src].")) playsound(loc, 'sound/items/Deconstruct.ogg', 25, 1) var/obj/item/mortar_kit/mortar = new /obj/item/mortar_kit(loc) @@ -313,7 +313,7 @@ if(HAS_TRAIT(item, TRAIT_TOOL_SCREWDRIVER)) if(do_after(user, 1 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) - user.visible_message(SPAN_NOTICE("[user] toggles the targeting computer on [src]."), \ + user.visible_message(SPAN_NOTICE("[user] toggles the targeting computer on [src]."), SPAN_NOTICE("You toggle the targeting computer on [src].")) computer_enabled = !computer_enabled playsound(loc, 'sound/machines/switch.ogg', 25, 1) @@ -440,17 +440,17 @@ if(CEILING_IS_PROTECTED(area.ceiling, CEILING_PROTECTION_TIER_1) && is_ground_level(deploy_turf.z)) to_chat(user, SPAN_WARNING("You probably shouldn't deploy [src] indoors.")) return - user.visible_message(SPAN_NOTICE("[user] starts deploying [src]."), \ + user.visible_message(SPAN_NOTICE("[user] starts deploying [src]."), SPAN_NOTICE("You start deploying [src].")) playsound(deploy_turf, 'sound/items/Deconstruct.ogg', 25, 1) if(do_after(user, 4 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) var/obj/structure/mortar/mortar = new /obj/structure/mortar(deploy_turf) if(!is_ground_level(deploy_turf.z)) mortar.ship_side = TRUE - user.visible_message(SPAN_NOTICE("[user] deploys [src]."), \ + user.visible_message(SPAN_NOTICE("[user] deploys [src]."), SPAN_NOTICE("You deploy [src]. This is a bad idea.")) else - user.visible_message(SPAN_NOTICE("[user] deploys [src]."), \ + user.visible_message(SPAN_NOTICE("[user] deploys [src]."), SPAN_NOTICE("You deploy [src].")) playsound(deploy_turf, 'sound/weapons/gun_mortar_unpack.ogg', 25, 1) mortar.name = src.name diff --git a/code/modules/cm_marines/m2c.dm b/code/modules/cm_marines/m2c.dm index 405193a214d8..2249de6671b7 100644 --- a/code/modules/cm_marines/m2c.dm +++ b/code/modules/cm_marines/m2c.dm @@ -181,12 +181,12 @@ var/obj/item/tool/weldingtool/weldingtool = object if(weldingtool.remove_fuel(2, user)) - user.visible_message(SPAN_NOTICE("[user] begins field recovering \the [src]."), \ + user.visible_message(SPAN_NOTICE("[user] begins field recovering \the [src]."), SPAN_NOTICE("You begin repairing the severe damages on \the [src] in an effort to restore its functions.")) playsound(src.loc, 'sound/items/Welder2.ogg', 25, 1) if(!do_after(user, field_recovery * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_ALL, BUSY_ICON_FRIENDLY, src)) return - user.visible_message(SPAN_NOTICE("[user] field recovers \the [src], restoring it back to its original state."), \ + user.visible_message(SPAN_NOTICE("[user] field recovers \the [src], restoring it back to its original state."), SPAN_NOTICE("You repair \the [src] back to a functional state.")) broken_gun = FALSE health = 110 @@ -383,12 +383,12 @@ return if(weldingtool.remove_fuel(2, user)) - user.visible_message(SPAN_NOTICE("[user] begins repairing damage on \the [src]."), \ + user.visible_message(SPAN_NOTICE("[user] begins repairing damage on \the [src]."), SPAN_NOTICE("You begin repairing the damage on \the [src].")) playsound(src.loc, 'sound/items/Welder2.ogg', 25, 1) if(!do_after(user, repair_time * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_ALL, BUSY_ICON_FRIENDLY, src)) return - user.visible_message(SPAN_NOTICE("[user] repairs some of the damage on [src]."), \ + user.visible_message(SPAN_NOTICE("[user] repairs some of the damage on [src]."), SPAN_NOTICE("You repair [src].")) update_health(-floor(health_max*0.2)) playsound(src.loc, 'sound/items/Welder2.ogg', 25, 1) diff --git a/code/modules/cm_marines/smartgun_mount.dm b/code/modules/cm_marines/smartgun_mount.dm index e22b6ca56bef..fb21ec0960c5 100644 --- a/code/modules/cm_marines/smartgun_mount.dm +++ b/code/modules/cm_marines/smartgun_mount.dm @@ -653,11 +653,11 @@ return if(WT.remove_fuel(0, user)) - user.visible_message(SPAN_NOTICE("[user] begins repairing damage to [src]."), \ + user.visible_message(SPAN_NOTICE("[user] begins repairing damage to [src]."), SPAN_NOTICE("You begin repairing the damage to [src].")) playsound(src.loc, 'sound/items/Welder2.ogg', 25, 1) if(do_after(user, 5 SECONDS * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_ALL, BUSY_ICON_FRIENDLY, src)) - user.visible_message(SPAN_NOTICE("[user] repairs some damage on [src]."), \ + user.visible_message(SPAN_NOTICE("[user] repairs some damage on [src]."), SPAN_NOTICE("You repair [src].")) update_health(-floor(health_max*0.2)) playsound(src.loc, 'sound/items/Welder2.ogg', 25, 1) diff --git a/code/modules/cm_preds/yaut_weapons.dm b/code/modules/cm_preds/yaut_weapons.dm index b3534b2ab5fc..ac161458518b 100644 --- a/code/modules/cm_preds/yaut_weapons.dm +++ b/code/modules/cm_preds/yaut_weapons.dm @@ -435,8 +435,8 @@ if(user.get_active_hand() != src) return if(!on) - user.visible_message(SPAN_INFO("With a flick of their wrist, [user] extends [src]."),\ - SPAN_NOTICE("You extend [src]."),\ + user.visible_message(SPAN_INFO("With a flick of their wrist, [user] extends [src]."), + SPAN_NOTICE("You extend [src]."), "You hear blades extending.") playsound(src,'sound/handling/combistick_open.ogg', 50, TRUE, 3) icon_state = initial(icon_state) @@ -509,7 +509,7 @@ if(isyautja(hit_atom)) var/mob/living/carbon/human/human = hit_atom if(human.put_in_hands(src)) - hit_atom.visible_message(SPAN_NOTICE(" [hit_atom] expertly catches [src] out of the air. "), \ + hit_atom.visible_message(SPAN_NOTICE(" [hit_atom] expertly catches [src] out of the air. "), SPAN_NOTICE(" You easily catch [src]. ")) return ..() diff --git a/code/modules/cm_tech/resources/resource.dm b/code/modules/cm_tech/resources/resource.dm index 948de533a2ba..6bc93bf17bd0 100644 --- a/code/modules/cm_tech/resources/resource.dm +++ b/code/modules/cm_tech/resources/resource.dm @@ -140,7 +140,7 @@ to_chat(H, SPAN_WARNING("You're already performing an action!")) return - H.visible_message(SPAN_DANGER("[H] starts to set up [src]."),\ + H.visible_message(SPAN_DANGER("[H] starts to set up [src]."), SPAN_NOTICE("You begin to set up [src]."), max_distance = 3) playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1) @@ -149,7 +149,7 @@ return playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1) - H.visible_message(SPAN_DANGER("[H] sets up [src]."),\ + H.visible_message(SPAN_DANGER("[H] sets up [src]."), SPAN_NOTICE("You set up [src]."), max_distance = 3) /obj/structure/resource_node/attack_alien(mob/living/carbon/xenomorph/M) @@ -165,7 +165,7 @@ to_chat(M, SPAN_WARNING("You're already performing an action!")) return XENO_NO_DELAY_ACTION - M.visible_message(SPAN_DANGER("[M] starts secreting resin over [src]."),\ + M.visible_message(SPAN_DANGER("[M] starts secreting resin over [src]."), SPAN_XENONOTICE("You begin to connect [src] to the hive."), max_distance = 3) xeno_attack_delay(M) @@ -173,7 +173,7 @@ to_chat(M, SPAN_XENOWARNING("You decide not to connect [src] to the hive.")) return XENO_NO_DELAY_ACTION - M.visible_message(SPAN_DANGER("[M] secretes resin over [src]."),\ + M.visible_message(SPAN_DANGER("[M] secretes resin over [src]."), SPAN_XENONOTICE("You connect [src] to the hive."), max_distance = 3) return XENO_NO_DELAY_ACTION diff --git a/code/modules/desert_dam/motion_sensor/sensortower.dm b/code/modules/desert_dam/motion_sensor/sensortower.dm index 373dd2692963..a6127770908c 100644 --- a/code/modules/desert_dam/motion_sensor/sensortower.dm +++ b/code/modules/desert_dam/motion_sensor/sensortower.dm @@ -209,7 +209,7 @@ var/turf/cur_loc = M.loc playsound(loc, 'sound/effects/metal_creaking.ogg', 25, TRUE) - M.visible_message(SPAN_DANGER("[M] starts wrenching apart \the [src]'s panels and reaching inside it!"), \ + M.visible_message(SPAN_DANGER("[M] starts wrenching apart \the [src]'s panels and reaching inside it!"), SPAN_DANGER("You start wrenching apart \the [src]'s panels and reaching inside it!"), null, 5, CHAT_TYPE_XENO_COMBAT) xeno_attack_delay(M) if(do_after(M, 40, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) @@ -225,11 +225,11 @@ cur_tick = 0 stop_processing() update_icon() - M.visible_message(SPAN_DANGER("[M] pulls apart \the [src]'s panels and breaks all its internal wiring and tubing!"), \ + M.visible_message(SPAN_DANGER("[M] pulls apart \the [src]'s panels and breaks all its internal wiring and tubing!"), SPAN_DANGER("You pull apart \the [src]'s panels and break all its internal wiring and tubing!"), null, 5, CHAT_TYPE_XENO_COMBAT) playsound(loc, 'sound/effects/meteorimpact.ogg', 25, 1) else - M.visible_message(SPAN_DANGER("[M] stops destroying \the [src]'s internal machinery!"), \ + M.visible_message(SPAN_DANGER("[M] stops destroying \the [src]'s internal machinery!"), SPAN_DANGER("You stop destroying \the [src]'s internal machinery!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_NO_DELAY_ACTION diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index 033bad3681d0..25e37d000720 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -379,7 +379,7 @@ GLOBAL_LIST_EMPTY(gene_tag_masks) // Gene obfuscation for delicious trial and else source_turf.visible_message(SPAN_NOTICE("\The [display_name]'s flowers wither and fall off.")) else //New chems! (20% chance) - var/new_chem = list(pick( prob(10);pick(GLOB.chemical_gen_classes_list["C1"]),\ + var/new_chem = list(pick( prob(10);pick(GLOB.chemical_gen_classes_list["C1"]), prob(15);pick(GLOB.chemical_gen_classes_list["C2"]),\ prob(25);pick(GLOB.chemical_gen_classes_list["C3"]),\ prob(30);pick(GLOB.chemical_gen_classes_list["C4"]),\ diff --git a/code/modules/hydroponics/vines.dm b/code/modules/hydroponics/vines.dm index 5e309919481c..12a90ede0c32 100644 --- a/code/modules/hydroponics/vines.dm +++ b/code/modules/hydroponics/vines.dm @@ -76,22 +76,22 @@ if(prob(seed ? min(max(0,100 - seed.potency),100) : 50)) if(buckled_mob.buckled == src) if(buckled_mob != user) - buckled_mob.visible_message(\ - SPAN_NOTICE("[user.name] frees [buckled_mob.name] from [src]."),\ - SPAN_NOTICE("[user.name] frees you from [src]."),\ + buckled_mob.visible_message( + SPAN_NOTICE("[user.name] frees [buckled_mob.name] from [src]."), + SPAN_NOTICE("[user.name] frees you from [src]."), SPAN_WARNING("You hear shredding and ripping.")) else - buckled_mob.visible_message(\ - SPAN_NOTICE("[buckled_mob.name] struggles free of [src]."),\ - SPAN_NOTICE("You untangle [src] from around yourself."),\ + buckled_mob.visible_message( + SPAN_NOTICE("[buckled_mob.name] struggles free of [src]."), + SPAN_NOTICE("You untangle [src] from around yourself."), SPAN_WARNING("You hear shredding and ripping.")) unbuckle() return 1 else var/text = pick("rips","tears","pulls") - user.visible_message(\ - SPAN_NOTICE("[user.name] [text] at [src]."),\ - SPAN_NOTICE("You [text] at [src]."),\ + user.visible_message( + SPAN_NOTICE("[user.name] [text] at [src]."), + SPAN_NOTICE("You [text] at [src]."), SPAN_WARNING("You hear shredding and ripping.")) return 0 diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index e30181fc94e7..44f59d5cdfc6 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -226,8 +226,8 @@ playsound(loc, "sparks", 25, 1) if(shock_damage > 10) src.visible_message( - SPAN_DANGER("[src] was shocked by [source]!"), \ - SPAN_DANGER("You feel a powerful shock course through your body!"), \ + SPAN_DANGER("[src] was shocked by [source]!"), + SPAN_DANGER("You feel a powerful shock course through your body!"), SPAN_DANGER("You hear a heavy electrical crack.") \ ) if(isxeno(src) && mob_size >= MOB_SIZE_BIG) @@ -241,8 +241,8 @@ else src.visible_message( - SPAN_DANGER("[src] was mildly shocked by [source]."), \ - SPAN_DANGER("You feel a mild shock course through your body."), \ + SPAN_DANGER("[src] was mildly shocked by [source]."), + SPAN_DANGER("You feel a mild shock course through your body."), SPAN_DANGER("You hear a light zapping.") \ ) @@ -305,11 +305,11 @@ if(shake_action) // We are incapacitated in some fashion if(client) sleeping = max(0,sleeping-5) - M.visible_message(SPAN_NOTICE("[M] shakes [src] trying to [shake_action]"), \ + M.visible_message(SPAN_NOTICE("[M] shakes [src] trying to [shake_action]"), SPAN_NOTICE("You shake [src] trying to [shake_action]"), null, 4) else if(body_position == LYING_DOWN) // We're just chilling on the ground, let us be - M.visible_message(SPAN_NOTICE("[M] stares and waves impatiently at [src] lying on the ground."), \ + M.visible_message(SPAN_NOTICE("[M] stares and waves impatiently at [src] lying on the ground."), SPAN_NOTICE("You stare and wave at [src] just lying on the ground."), null, 4) else @@ -317,7 +317,7 @@ if(istype(H)) H.species.hug(H, src, H.zone_selected) else - M.visible_message(SPAN_NOTICE("[M] pats [src] on the back to make [t_him] feel better!"), \ + M.visible_message(SPAN_NOTICE("[M] pats [src] on the back to make [t_him] feel better!"), SPAN_NOTICE("You pat [src] on the back to make [t_him] feel better!"), null, 4) playsound(loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 5) return @@ -511,10 +511,10 @@ /mob/living/carbon/proc/extinguish_mob(mob/living/carbon/C) adjust_fire_stacks(-5, min_stacks = 0) playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7) - C.visible_message(SPAN_DANGER("[C] tries to put out the fire on [src]!"), \ + C.visible_message(SPAN_DANGER("[C] tries to put out the fire on [src]!"), SPAN_WARNING("You try to put out the fire on [src]!"), null, 5) if(fire_stacks <= 0) - C.visible_message(SPAN_DANGER("[C] has successfully extinguished the fire on [src]!"), \ + C.visible_message(SPAN_DANGER("[C] has successfully extinguished the fire on [src]!"), SPAN_NOTICE("You extinguished the fire on [src]."), null, 5) /mob/living/carbon/resist_buckle() @@ -522,12 +522,12 @@ if(handcuffed) next_move = world.time + 100 last_special = world.time + 100 - visible_message(SPAN_DANGER("[src] attempts to unbuckle themself!"),\ + visible_message(SPAN_DANGER("[src] attempts to unbuckle themself!"), SPAN_DANGER("You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stand still)")) if(do_after(src, 1200, INTERRUPT_NO_FLOORED^INTERRUPT_RESIST, BUSY_ICON_HOSTILE)) if(!buckled) return - visible_message(SPAN_DANGER("[src] manages to unbuckle themself!"),\ + visible_message(SPAN_DANGER("[src] manages to unbuckle themself!"), SPAN_NOTICE("You successfully unbuckle yourself.")) buckled.manual_unbuckle(src) else diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 7235e03c26cb..da5ea73b087b 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1476,7 +1476,7 @@ if(new_splint.amount == 0) qdel(new_splint) //we only removed nano splints msg = "[user == target ? "their own":"\proper [target]'s"]" - target.visible_message(SPAN_NOTICE("[user] removes [msg] [amount_removed>1 ? "splints":"splint"]."), \ + target.visible_message(SPAN_NOTICE("[user] removes [msg] [amount_removed>1 ? "splints":"splint"]."), SPAN_NOTICE("Your [amount_removed>1 ? "splints are":"splint is"] removed.")) target.update_med_icon() else @@ -1534,13 +1534,13 @@ adjust_fire_stacks(HUNTER_FIRE_RESIST_AMOUNT, min_stacks = 0) apply_effect(1, WEAKEN) // actually 0.5 spin(5, 1) - visible_message(SPAN_DANGER("[src] expertly rolls on the floor, greatly reducing the amount of flames!"), \ + visible_message(SPAN_DANGER("[src] expertly rolls on the floor, greatly reducing the amount of flames!"), SPAN_NOTICE("You expertly roll to extinguish the flames!"), null, 5) else adjust_fire_stacks(HUMAN_FIRE_RESIST_AMOUNT, min_stacks = 0) apply_effect(4, WEAKEN) spin(35, 2) - visible_message(SPAN_DANGER("[src] rolls on the floor, trying to put themselves out!"), \ + visible_message(SPAN_DANGER("[src] rolls on the floor, trying to put themselves out!"), SPAN_NOTICE("You stop, drop, and roll!"), null, 5) if(istype(get_turf(src), /turf/open/gm/river)) @@ -1549,7 +1549,7 @@ if(fire_stacks > 0) return - visible_message(SPAN_DANGER("[src] has successfully extinguished themselves!"), \ + visible_message(SPAN_DANGER("[src] has successfully extinguished themselves!"), SPAN_NOTICE("You extinguish yourself."), null, 5) /mob/living/carbon/human/resist_acid() @@ -1557,21 +1557,21 @@ if(isyautja(src)) apply_effect(1, WEAKEN) spin(10, 2) - visible_message(SPAN_DANGER("[src] expertly rolls on the floor!"), \ + visible_message(SPAN_DANGER("[src] expertly rolls on the floor!"), SPAN_NOTICE("You expertly roll to get rid of the acid!"), max_distance = 5) else apply_effect(1.5, WEAKEN) spin(15, 2) - visible_message(SPAN_DANGER("[src] rolls on the floor, trying to get the acid off!"), \ + visible_message(SPAN_DANGER("[src] rolls on the floor, trying to get the acid off!"), SPAN_NOTICE("You stop, drop, and roll!"), max_distance = 5) sleep(sleep_amount) if( extinguish_acid() ) - visible_message(SPAN_DANGER("[src] has successfully removed the acid!"), \ + visible_message(SPAN_DANGER("[src] has successfully removed the acid!"), SPAN_NOTICE("You get rid of the acid."), max_distance = 5) else - visible_message(SPAN_DANGER("[src] has managed to get rid of some of the acid!"), \ + visible_message(SPAN_DANGER("[src] has managed to get rid of some of the acid!"), SPAN_NOTICE("You manage to get rid of some of the acid... but it's still melting you!"), max_distance = 5) return @@ -1592,14 +1592,14 @@ last_special = world.time + 10 var/can_break_cuffs if(iszombie(src)) - visible_message(SPAN_DANGER("[src] is attempting to break out of [restraint]..."), \ + visible_message(SPAN_DANGER("[src] is attempting to break out of [restraint]..."), SPAN_NOTICE("You use your superior zombie strength to start breaking [restraint]...")) if(!do_after(src, 100, INTERRUPT_NO_NEEDHAND^INTERRUPT_RESIST, BUSY_ICON_HOSTILE)) return if(!restraint || buckled) return - visible_message(SPAN_DANGER("[src] tears [restraint] in half!"), \ + visible_message(SPAN_DANGER("[src] tears [restraint] in half!"), SPAN_NOTICE("You tear [restraint] in half!")) restraint = null if(handcuffed) diff --git a/code/modules/mob/living/carbon/human/human_abilities.dm b/code/modules/mob/living/carbon/human/human_abilities.dm index 7d9c28c0d083..2ef06fe6f833 100644 --- a/code/modules/mob/living/carbon/human/human_abilities.dm +++ b/code/modules/mob/living/carbon/human/human_abilities.dm @@ -296,7 +296,7 @@ CULT to_chat(H, SPAN_WARNING("You have decided not to obtain your equipment.")) return - H.visible_message(SPAN_DANGER("[H] gets onto their knees and begins praying."), \ + H.visible_message(SPAN_DANGER("[H] gets onto their knees and begins praying."), SPAN_WARNING("You get onto your knees to pray.")) if(!do_after(H, 3 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index f1e09221d7c3..8cd2901be9bc 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -16,10 +16,10 @@ if(on_fire && attacking_mob != src) adjust_fire_stacks(-10, min_stacks = 0) playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7) - attacking_mob.visible_message(SPAN_DANGER("[attacking_mob] tries to put out the fire on [src]!"), \ + attacking_mob.visible_message(SPAN_DANGER("[attacking_mob] tries to put out the fire on [src]!"), SPAN_WARNING("You try to put out the fire on [src]!"), null, 5) if(fire_stacks <= 0) - attacking_mob.visible_message(SPAN_DANGER("[attacking_mob] has successfully extinguished the fire on [src]!"), \ + attacking_mob.visible_message(SPAN_DANGER("[attacking_mob] has successfully extinguished the fire on [src]!"), SPAN_NOTICE("You extinguished the fire on [src]."), null, 5) return 1 @@ -207,17 +207,17 @@ to_chat(M, SPAN_WARNING("[src] looks dizzy. Maybe you should let [t_him] rest a bit longer.")) else set_resting(FALSE) - M.visible_message(SPAN_NOTICE("[M] shakes [src] trying to wake [t_him] up!"), \ + M.visible_message(SPAN_NOTICE("[M] shakes [src] trying to wake [t_him] up!"), SPAN_NOTICE("You shake [src] trying to wake [t_him] up!"), null, 4) else if(HAS_TRAIT(src, TRAIT_INCAPACITATED)) - M.visible_message(SPAN_NOTICE("[M] shakes [src], trying to shake [t_him] out of his stupor!"), \ + M.visible_message(SPAN_NOTICE("[M] shakes [src], trying to shake [t_him] out of his stupor!"), SPAN_NOTICE("You shake [src], trying to shake [t_him] out of his stupor!"), null, 4) else var/mob/living/carbon/human/H = M if(istype(H)) H.species.hug(H, src, H.zone_selected) else - M.visible_message(SPAN_NOTICE("[M] pats [src] on the back to make [t_him] feel better!"), \ + M.visible_message(SPAN_NOTICE("[M] pats [src] on the back to make [t_him] feel better!"), SPAN_NOTICE("You pat [src] on the back to make [t_him] feel better!"), null, 4) playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 5) return @@ -229,7 +229,7 @@ playsound(loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7) /mob/living/carbon/human/proc/check_for_injuries() - visible_message(SPAN_NOTICE("[src] examines [gender==MALE?"himself":"herself"]."), \ + visible_message(SPAN_NOTICE("[src] examines [gender==MALE?"himself":"herself"]."), SPAN_NOTICE("You check yourself for injuries."), null, 3) var/list/limb_message = list() diff --git a/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm b/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm index 5b37238d28ab..4f7c40e726d3 100644 --- a/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm +++ b/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm @@ -35,7 +35,7 @@ qdel(a) if(halloss > 100) - visible_message(SPAN_WARNING("\The [src] slumps to the ground, too weak to continue fighting."), \ + visible_message(SPAN_WARNING("\The [src] slumps to the ground, too weak to continue fighting."), SPAN_WARNING("You slump to the ground, you're in too much pain to keep going.")) apply_effect(10, PARALYZE) setHalLoss(99) diff --git a/code/modules/mob/living/carbon/human/powers/human_powers.dm b/code/modules/mob/living/carbon/human/powers/human_powers.dm index 8b866fd7aff1..8ee1b75cb412 100644 --- a/code/modules/mob/living/carbon/human/powers/human_powers.dm +++ b/code/modules/mob/living/carbon/human/powers/human_powers.dm @@ -359,7 +359,7 @@ if(!is_zoomed) enable_zoom() - visible_message(SPAN_NOTICE("[src] starts looking off into the distance."), \ + visible_message(SPAN_NOTICE("[src] starts looking off into the distance."), SPAN_NOTICE("You start focusing your sight to look off into the distance."), null, 5) return diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 151c1fe65636..aebb76710776 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -207,13 +207,13 @@ attempt_fist_bump(H, target) return else if(H.body_position == LYING_DOWN) // Keep other interactions above lying check for maximum awkwardness potential - H.visible_message(SPAN_NOTICE("[H] waves at [target] to make [t_him] feel better!"), \ + H.visible_message(SPAN_NOTICE("[H] waves at [target] to make [t_him] feel better!"), SPAN_NOTICE("You wave at [target] to make [t_him] feel better!"), null, 4) else if(target_zone == "groin") - H.visible_message(SPAN_NOTICE("[H] hugs [target] to make [t_him] feel better!"), \ + H.visible_message(SPAN_NOTICE("[H] hugs [target] to make [t_him] feel better!"), SPAN_NOTICE("You hug [target] to make [t_him] feel better!"), null, 4) else - H.visible_message(SPAN_NOTICE("[H] pats [target] on the back to make [t_him] feel better!"), \ + H.visible_message(SPAN_NOTICE("[H] pats [target] on the back to make [t_him] feel better!"), SPAN_NOTICE("You pat [target] on the back to make [t_him] feel better!"), null, 4) playsound(target, 'sound/weapons/thudswoosh.ogg', 25, 1, 5) @@ -299,7 +299,7 @@ var/extra_quip = "" if(prob(10)) extra_quip = pick(" Down low!", " Eiffel Tower!") - H.visible_message(SPAN_NOTICE("[H] gives [target] a high five![extra_quip]"), \ + H.visible_message(SPAN_NOTICE("[H] gives [target] a high five![extra_quip]"), SPAN_NOTICE("You give [target] a high five![extra_quip]"), null, 4) playsound(target, 'sound/effects/snap.ogg', 25, 1) H.animation_attack_on(target) @@ -320,7 +320,7 @@ if(FEMALE) h_his = "her" - H.visible_message(SPAN_NOTICE("[H] raises [h_his] hand out for a high five from [target]."), \ + H.visible_message(SPAN_NOTICE("[H] raises [h_his] hand out for a high five from [target]."), SPAN_NOTICE("You raise your hand out for a high five from [target]."), null, 4) H.flags_emote |= EMOTING_HIGH_FIVE if(do_after(H, 50, INTERRUPT_ALL|INTERRUPT_EMOTE, EMOTE_ICON_HIGHFIVE) && H.flags_emote & EMOTING_HIGH_FIVE) @@ -342,7 +342,7 @@ to_chat(H, SPAN_NOTICE("Too slow!")) return target.flags_emote &= ~EMOTING_FIST_BUMP - H.visible_message(SPAN_NOTICE("[H] gives [target] a fistbump!"), \ + H.visible_message(SPAN_NOTICE("[H] gives [target] a fistbump!"), SPAN_NOTICE("You give [target] a fistbump!"), null, 4) playsound(target, 'sound/effects/thud.ogg', 40, 1) H.animation_attack_on(target) @@ -362,7 +362,7 @@ if(FEMALE) h_his = "her" - H.visible_message(SPAN_NOTICE("[H] raises [h_his] fist out for a fistbump from [target]."), \ + H.visible_message(SPAN_NOTICE("[H] raises [h_his] fist out for a fistbump from [target]."), SPAN_NOTICE("You raise your fist out for a fistbump from [target]."), null, 4) H.flags_emote |= EMOTING_FIST_BUMP if(do_after(H, 50, INTERRUPT_ALL|INTERRUPT_EMOTE, EMOTE_ICON_FISTBUMP) && H.flags_emote & EMOTING_FIST_BUMP) diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm index efdaa765bf75..120ea811727b 100644 --- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm +++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm @@ -107,7 +107,7 @@ if(prob(4)) if(!HAS_TRAIT(src, TRAIT_KNOCKEDOUT)) affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) - affected_mob.visible_message(SPAN_DANGER("[affected_mob] starts shaking uncontrollably!"), \ + affected_mob.visible_message(SPAN_DANGER("[affected_mob] starts shaking uncontrollably!"), SPAN_DANGER("You feel something moving inside you! You start shaking uncontrollably!")) affected_mob.apply_effect(1, PARALYZE) affected_mob.make_jittery(105) @@ -128,7 +128,7 @@ if(prob(5)) if(!HAS_TRAIT(src, TRAIT_KNOCKEDOUT)) affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) - affected_mob.visible_message(SPAN_DANGER("\The [affected_mob] starts shaking uncontrollably!"), \ + affected_mob.visible_message(SPAN_DANGER("\The [affected_mob] starts shaking uncontrollably!"), SPAN_DANGER("You feel something moving inside you! You start shaking uncontrollably!")) affected_mob.apply_effect(2, PARALYZE) affected_mob.make_jittery(105) @@ -144,7 +144,7 @@ if(prob(6)) if(!HAS_TRAIT(src, TRAIT_KNOCKEDOUT)) affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) - affected_mob.visible_message(SPAN_DANGER("[affected_mob] starts shaking uncontrollably!"), \ + affected_mob.visible_message(SPAN_DANGER("[affected_mob] starts shaking uncontrollably!"), SPAN_DANGER("You feel something moving inside you! You start shaking uncontrollably!")) affected_mob.apply_effect(3, PARALYZE) affected_mob.make_jittery(105) @@ -298,7 +298,7 @@ to_chat(src, SPAN_DANGER("We start bursting out of [victim]'s chest!")) if(!HAS_TRAIT(src, TRAIT_KNOCKEDOUT)) victim.apply_effect(20, DAZE) - victim.visible_message(SPAN_DANGER("\The [victim] starts shaking uncontrollably!"), \ + victim.visible_message(SPAN_DANGER("\The [victim] starts shaking uncontrollably!"), SPAN_DANGER("You feel something ripping up your insides!")) victim.make_jittery(300) sleep(30) diff --git a/code/modules/mob/living/carbon/xenomorph/Evolution.dm b/code/modules/mob/living/carbon/xenomorph/Evolution.dm index bcb61ecc1703..03a288c70a47 100644 --- a/code/modules/mob/living/carbon/xenomorph/Evolution.dm +++ b/code/modules/mob/living/carbon/xenomorph/Evolution.dm @@ -102,7 +102,7 @@ return to_chat(src, SPAN_XENONOTICE("It looks like the hive can support our evolution to [SPAN_BOLD(castepick)]!")) - visible_message(SPAN_XENONOTICE("\The [src] begins to twist and contort."), \ + visible_message(SPAN_XENONOTICE("\The [src] begins to twist and contort."), SPAN_XENONOTICE("We begin to twist and contort.")) xeno_jitter(25) evolving = TRUE @@ -181,7 +181,7 @@ built_structures = null - new_xeno.visible_message(SPAN_XENODANGER("A [new_xeno.caste.caste_type] emerges from the husk of \the [src]."), \ + new_xeno.visible_message(SPAN_XENODANGER("A [new_xeno.caste.caste_type] emerges from the husk of \the [src]."), SPAN_XENODANGER("We emerge in a greater form from the husk of our old body. For the hive!")) if(hive.living_xeno_queen && hive.living_xeno_queen.observed_xeno == src) @@ -312,7 +312,7 @@ var/mob/living/carbon/xenomorph/new_xeno = transmute(newcaste) if(new_xeno) log_game("EVOLVE: [key_name(src)] de-evolved into [new_xeno].") - + return /mob/living/carbon/xenomorph/proc/transmute(newcaste) @@ -324,7 +324,7 @@ var/level_to_switch_to = get_vision_level() var/xeno_type = GLOB.RoleAuthority.get_caste_by_text(newcaste) var/mob/living/carbon/xenomorph/new_xeno = new xeno_type(get_turf(src), src) - + if(!istype(new_xeno)) //Something went horribly wrong to_chat(src, SPAN_WARNING("Something went terribly wrong here. Your new xeno is null! Tell a coder immediately!")) @@ -364,7 +364,7 @@ if(!(/mob/living/carbon/xenomorph/verb/Deevolve in verbs)) remove_verb(new_xeno, /mob/living/carbon/xenomorph/verb/Deevolve) - new_xeno.visible_message(SPAN_XENODANGER("A [new_xeno.caste.caste_type] emerges from the husk of \the [src]."), \ + new_xeno.visible_message(SPAN_XENODANGER("A [new_xeno.caste.caste_type] emerges from the husk of \the [src]."), SPAN_XENODANGER("We regress into our previous form.")) transfer_observers_to(new_xeno) diff --git a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm index 97bd4fd40320..3d7db8b58844 100644 --- a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm +++ b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm @@ -271,7 +271,7 @@ if(!target) return FALSE - target.visible_message(SPAN_WARNING("[src] leaps at [target]!"), \ + target.visible_message(SPAN_WARNING("[src] leaps at [target]!"), SPAN_WARNING("[src] leaps at [target]!")) leaping = TRUE throw_atom(target, 3, SPEED_FAST) diff --git a/code/modules/mob/living/carbon/xenomorph/Powers.dm b/code/modules/mob/living/carbon/xenomorph/Powers.dm index 687853c211a8..8d65ed61f02e 100644 --- a/code/modules/mob/living/carbon/xenomorph/Powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/Powers.dm @@ -86,7 +86,7 @@ if(thickened) if(message) - visible_message(SPAN_XENONOTICE("[src] regurgitates a thick substance and thickens [target]."), \ + visible_message(SPAN_XENONOTICE("[src] regurgitates a thick substance and thickens [target]."), SPAN_XENONOTICE("We regurgitate some resin and thicken [target], using [total_resin_cost] plasma."), null, 5) if(use_plasma) use_plasma(total_resin_cost) @@ -140,7 +140,7 @@ if(use_plasma) use_plasma(total_resin_cost) if(message) - visible_message(SPAN_XENONOTICE("[src] regurgitates a thick substance and shapes it into \a [resin_construct.construction_name]!"), \ + visible_message(SPAN_XENONOTICE("[src] regurgitates a thick substance and shapes it into \a [resin_construct.construction_name]!"), SPAN_XENONOTICE("We regurgitate some resin and shape it into \a [resin_construct.construction_name][use_plasma ? " at the cost of a total [total_resin_cost] plasma" : ""]."), null, 5) playsound(loc, "alien_resin_build", 25) @@ -179,7 +179,7 @@ var/max_constructions = hive.hive_structures_limit[structure_template.name] var/remaining_constructions = max_constructions - hive.get_structure_count(structure_template.name) - visible_message(SPAN_XENONOTICE("A thick substance emerges from the ground and shapes into \a [new_structure]."), \ + visible_message(SPAN_XENONOTICE("A thick substance emerges from the ground and shapes into \a [new_structure]."), SPAN_XENONOTICE("We designate a new [structure_template] construction. ([remaining_constructions]/[max_constructions] remaining)"), null, 5) playsound(new_structure, "alien_resin_build", 25) diff --git a/code/modules/mob/living/carbon/xenomorph/XenoAttacks.dm b/code/modules/mob/living/carbon/xenomorph/XenoAttacks.dm index 3694c2a0357d..1785d8c7400d 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoAttacks.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoAttacks.dm @@ -38,7 +38,7 @@ M.visible_message(SPAN_WARNING("\The [M] tried to open \the [backpack] on [src] but instead gets a tail swipe to the head!")) return FALSE - M.visible_message(SPAN_NOTICE("\The [M] starts opening \the [backpack] on [src]"), \ + M.visible_message(SPAN_NOTICE("\The [M] starts opening \the [backpack] on [src]"), SPAN_NOTICE("You begin to open \the [backpack] on [src], so you can check its contents."), null, 5, CHAT_TYPE_FLUFF_ACTION) if(!do_after(M, 1 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_GENERIC, src, INTERRUPT_MOVED, BUSY_ICON_GENERIC)) //Timed opening. to_chat(M, SPAN_WARNING("You were interrupted!")) @@ -49,10 +49,10 @@ backpack.open(M) return if(stat == DEAD) - M.visible_message(SPAN_WARNING("\The [M] pokes \the [src], but nothing happens."), \ + M.visible_message(SPAN_WARNING("\The [M] pokes \the [src], but nothing happens."), SPAN_WARNING("You poke \the [src], but nothing happens."), null, 5, CHAT_TYPE_FLUFF_ACTION) else - M.visible_message(SPAN_WARNING("\The [M] pokes \the [src]."), \ + M.visible_message(SPAN_WARNING("\The [M] pokes \the [src]."), SPAN_WARNING("You poke \the [src]."), null, 5, CHAT_TYPE_FLUFF_ACTION) if(INTENT_GRAB) @@ -115,7 +115,7 @@ return XENO_NO_DELAY_ACTION if(islarva(M)) //Larvas can't eat people - M.visible_message(SPAN_DANGER("[M] nudges its head against \the [src]."), \ + M.visible_message(SPAN_DANGER("[M] nudges its head against \the [src]."), SPAN_DANGER("We nudge our head against \the [src]."), null, null, CHAT_TYPE_XENO_FLUFF) return @@ -130,7 +130,7 @@ M.attempt_tailswipe(src) return XENO_NONCOMBAT_ACTION else - M.visible_message(SPAN_NOTICE("\The [M] caresses \the [src] with its claws."), \ + M.visible_message(SPAN_NOTICE("\The [M] caresses \the [src] with its claws."), SPAN_NOTICE("We caress \the [src] with our claws."), null, 5, CHAT_TYPE_XENO_FLUFF) if(INTENT_GRAB) @@ -140,7 +140,7 @@ if(Adjacent(M)) //Logic! M.start_pulling(src) - M.visible_message(SPAN_WARNING("[M] grabs \the [src]!"), \ + M.visible_message(SPAN_WARNING("[M] grabs \the [src]!"), SPAN_WARNING("You grab \the [src]!"), null, 5, CHAT_TYPE_XENO_FLUFF) playsound(loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7) @@ -172,11 +172,11 @@ //Somehow we will deal no damage on this attack if(!damage) playsound(M.loc, 'sound/weapons/alien_claw_swipe.ogg', 25, 1) - M.visible_message(SPAN_DANGER("\The [M] lunges at [src]!"), \ + M.visible_message(SPAN_DANGER("\The [M] lunges at [src]!"), SPAN_DANGER("You lunge at [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION - M.visible_message(SPAN_DANGER("\The [M] [slashes_verb] [src]!"), \ + M.visible_message(SPAN_DANGER("\The [M] [slashes_verb] [src]!"), SPAN_DANGER("You [slash_verb] [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) last_damage_data = create_cause_data(initial(M.name), M) src.attack_log += text("\[[time_stamp()]\] was [slash_verb]ed by [key_name(M)]") @@ -205,12 +205,12 @@ var/can_mega_shove = is_shover_queen || IS_XENO_LEADER(M) if(can_mega_shove && !can_resist_shove || (mob_size < MOB_SIZE_XENO_SMALL && M.mob_size >= MOB_SIZE_XENO_SMALL)) playsound(loc, 'sound/weapons/alien_knockdown.ogg', 25, 1) - M.visible_message(SPAN_WARNING("\The [M] shoves \the [src] out of her way!"), \ + M.visible_message(SPAN_WARNING("\The [M] shoves \the [src] out of her way!"), SPAN_WARNING("We shove \the [src] out of our way!"), null, 5, CHAT_TYPE_XENO_COMBAT) src.apply_effect(1, WEAKEN) else playsound(loc, 'sound/weapons/thudswoosh.ogg', 25, 1) - M.visible_message(SPAN_WARNING("\The [M] shoves \the [src]!"), \ + M.visible_message(SPAN_WARNING("\The [M] shoves \the [src]!"), SPAN_WARNING("We shove \the [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION @@ -221,7 +221,7 @@ to_chat(src, SPAN_NOTICE("Too slow!")) return target.flags_emote &= ~EMOTING_HEADBUTT - visible_message(SPAN_NOTICE("[src] slams their head into [target]!"), \ + visible_message(SPAN_NOTICE("[src] slams their head into [target]!"), SPAN_NOTICE("We slam your head into [target]!"), null, 4) playsound(src, pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg'), 50, 1) animation_attack_on(target) @@ -235,7 +235,7 @@ to_chat(src, "You just did an audible emote. Wait a while.") return - visible_message(SPAN_NOTICE("[src] raises their head for a headbutt from [target]."), \ + visible_message(SPAN_NOTICE("[src] raises their head for a headbutt from [target]."), SPAN_NOTICE("We raise our head for a headbutt from [target]."), null, 4) flags_emote |= EMOTING_HEADBUTT if(do_after(src, 50, INTERRUPT_ALL|INTERRUPT_EMOTE, EMOTE_ICON_HEADBUTT) && flags_emote & EMOTING_HEADBUTT) @@ -249,7 +249,7 @@ to_chat(src, SPAN_NOTICE("Too slow!")) return target.flags_emote &= ~EMOTING_TAIL_SWIPE - visible_message(SPAN_NOTICE("[src] clashes their tail with [target]!"), \ + visible_message(SPAN_NOTICE("[src] clashes their tail with [target]!"), SPAN_NOTICE("We clash our tail with [target]!"), null, 4) playsound(src, 'sound/weapons/alien_claw_block.ogg', 50, 1) spin_circle() @@ -263,7 +263,7 @@ to_chat(src, "You just did an audible emote. Wait a while.") return - visible_message(SPAN_NOTICE("[src] raises their tail out for a swipe from [target]."), \ + visible_message(SPAN_NOTICE("[src] raises their tail out for a swipe from [target]."), SPAN_NOTICE("We raise our tail out for a tail swipe from [target]."), null, 4) flags_emote |= EMOTING_TAIL_SWIPE if(do_after(src, 50, INTERRUPT_ALL|INTERRUPT_EMOTE, EMOTE_ICON_TAILSWIPE) && flags_emote & EMOTING_TAIL_SWIPE) diff --git a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm index f9646a93eef9..31b0d919d049 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm @@ -398,7 +398,7 @@ victim.acid_damage = 0 victim.forceMove(get_true_turf(loc)) - visible_message(SPAN_XENOWARNING("[src] hurls out the contents of their stomach!"), \ + visible_message(SPAN_XENOWARNING("[src] hurls out the contents of their stomach!"), SPAN_XENOWARNING("We hurl out the contents of our stomach!"), null, 5) playsound(get_true_location(loc), 'sound/voice/alien_drool2.ogg', 50, 1) log_interact(src, victim, "[key_name(src)] regurgitated [key_name(victim)] at [get_area_name(loc)]") diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm index ccfef44aa431..d9bce2abe394 100644 --- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm @@ -1003,7 +1003,7 @@ /mob/living/carbon/xenomorph/resist_fire() adjust_fire_stacks(XENO_FIRE_RESIST_AMOUNT, min_stacks = 0) apply_effect(4, WEAKEN) - visible_message(SPAN_DANGER("[src] rolls on the floor, trying to put themselves out!"), \ + visible_message(SPAN_DANGER("[src] rolls on the floor, trying to put themselves out!"), SPAN_NOTICE("You stop, drop, and roll!"), null, 5) if(istype(get_turf(src), /turf/open/gm/river)) @@ -1012,7 +1012,7 @@ if(fire_stacks > 0) return - visible_message(SPAN_DANGER("[src] has successfully extinguished themselves!"), \ + visible_message(SPAN_DANGER("[src] has successfully extinguished themselves!"), SPAN_NOTICE("We extinguish ourselves."), null, 5) /mob/living/carbon/xenomorph/proc/get_organ_icon() @@ -1099,7 +1099,7 @@ if(current_airlock.locked || current_airlock.welded) //Can't pass through airlocks that have been bolted down or welded to_chat(src, SPAN_WARNING("[current_airlock] is locked down tight. We can't squeeze underneath!")) return FALSE - visible_message(SPAN_WARNING("[src] scuttles underneath [current_structure]!"), \ + visible_message(SPAN_WARNING("[src] scuttles underneath [current_structure]!"), SPAN_WARNING("We squeeze and scuttle underneath [current_structure]."), max_distance = 5) forceMove(current_structure.loc) return TRUE diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm index 772bf99aa7b5..69027af7b1b3 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm @@ -136,7 +136,7 @@ if(istype(O, /obj/vehicle/multitile)) var/obj/vehicle/multitile/R = O R.take_damage_type(40 / A.acid_delay, "acid", src) - visible_message(SPAN_XENOWARNING("[src] vomits globs of vile stuff at \the [O]. It sizzles under the bubbling mess of acid!"), \ + visible_message(SPAN_XENOWARNING("[src] vomits globs of vile stuff at \the [O]. It sizzles under the bubbling mess of acid!"), SPAN_XENOWARNING("We vomit globs of vile stuff at [O]. It sizzles under the bubbling mess of acid!"), null, 5) playsound(loc, "sound/bullets/acid_impact1.ogg", 25) QDEL_IN(A, 20) @@ -156,7 +156,7 @@ if(!isturf(O)) msg_admin_attack("[src.name] ([src.ckey]) spat acid on [O] in [get_area(src)] ([src.loc.x],[src.loc.y],[src.loc.z]).", src.loc.x, src.loc.y, src.loc.z) attack_log += text("\[[time_stamp()]\] Spat acid on [O]") - visible_message(SPAN_XENOWARNING("[src] vomits globs of vile stuff all over [O]. It begins to sizzle and melt under the bubbling mess of acid!"), \ + visible_message(SPAN_XENOWARNING("[src] vomits globs of vile stuff all over [O]. It begins to sizzle and melt under the bubbling mess of acid!"), SPAN_XENOWARNING("We vomit globs of vile stuff all over [O]. It begins to sizzle and melt under the bubbling mess of acid!"), null, 5) playsound(loc, "sound/bullets/acid_impact1.ogg", 25) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm index aef98fe7a60e..8d03479f8075 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm @@ -271,14 +271,14 @@ to_chat(xenomorph, SPAN_XENOWARNING("It's too early to spread the hive this far.")) return - xenomorph.visible_message(SPAN_XENONOTICE("[xenomorph] begins digging out a tunnel entrance."), \ + xenomorph.visible_message(SPAN_XENONOTICE("[xenomorph] begins digging out a tunnel entrance."), SPAN_XENONOTICE("We begin digging out a tunnel entrance."), null, 5) if(!do_after(xenomorph, 10 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) to_chat(xenomorph, SPAN_WARNING("Our tunnel caves in as we stop digging it.")) return if(!xenomorph.check_plasma(plasma_cost)) return - xenomorph.visible_message(SPAN_XENONOTICE("\The [xenomorph] digs out a tunnel entrance."), \ + xenomorph.visible_message(SPAN_XENONOTICE("\The [xenomorph] digs out a tunnel entrance."), SPAN_XENONOTICE("We dig out an entrance to the tunnel network."), null, 5) var/obj/structure/tunnel/tunnelobj = new(turf, xenomorph.hivenumber) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm index 1fe8f4be799a..f9bada566f58 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm @@ -76,7 +76,7 @@ return carbone.last_damage_data = create_cause_data(fendy.caste_type, fendy) - fendy.visible_message(SPAN_XENOWARNING("[fendy] rams [carbone] with its armored crest!"), \ + fendy.visible_message(SPAN_XENOWARNING("[fendy] rams [carbone] with its armored crest!"), SPAN_XENOWARNING("We ram [carbone] with our armored crest!")) if(carbone.stat != DEAD && (!(carbone.status_flags & XENO_HOST) || !HAS_TRAIT(carbone, TRAIT_NESTED))) @@ -116,7 +116,7 @@ xeno.balloon_alert(xeno, "our crest is lowered!", text_color = "#7d32bb", delay = 1 SECONDS) return - xeno.visible_message(SPAN_XENOWARNING("[xeno] sweeps its tail in a wide circle!"), \ + xeno.visible_message(SPAN_XENOWARNING("[xeno] sweeps its tail in a wide circle!"), SPAN_XENOWARNING("We sweep our tail in a wide circle!")) if(!check_and_use_plasma_owner()) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm index 7485cfe0015a..4594e87fb647 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm @@ -310,7 +310,7 @@ if(xeno.is_zoomed) xeno.zoom_out() // will call on_zoom_out() return - xeno.visible_message(SPAN_NOTICE("[xeno] starts looking off into the distance."), \ + xeno.visible_message(SPAN_NOTICE("[xeno] starts looking off into the distance."), SPAN_NOTICE("We start focusing our sight to look off into the distance."), null, 5) if (should_delay) if(!do_after(xeno, delay, INTERRUPT_NO_NEEDHAND, BUSY_ICON_GENERIC)) return @@ -327,7 +327,7 @@ /datum/action/xeno_action/onclick/toggle_long_range/proc/on_zoom_out() var/mob/living/carbon/xenomorph/xeno = owner - xeno.visible_message(SPAN_NOTICE("[xeno] stops looking off into the distance."), \ + xeno.visible_message(SPAN_NOTICE("[xeno] stops looking off into the distance."), SPAN_NOTICE("We stop looking off into the distance."), null, 5) if(movement_slowdown) xeno.speed_modifier -= movement_slowdown diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm index cf5732741a1e..7d507d46d8fa 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm @@ -65,7 +65,7 @@ if(node) to_convert = node.children.Copy() - xeno.visible_message(SPAN_XENONOTICE("\The [xeno] regurgitates a pulsating node and plants it on the ground!"), \ + xeno.visible_message(SPAN_XENONOTICE("\The [xeno] regurgitates a pulsating node and plants it on the ground!"), SPAN_XENONOTICE("We regurgitate a pulsating node and plant it on the ground!"), null, 5) var/obj/effect/alien/weeds/node/new_node = new node_type(xeno.loc, src, xeno) @@ -337,7 +337,7 @@ if(!pheromone) if(current_aura) current_aura = null - visible_message(SPAN_XENOWARNING("\The [src] stops emitting pheromones."), \ + visible_message(SPAN_XENOWARNING("\The [src] stops emitting pheromones."), SPAN_XENOWARNING("We stop emitting pheromones."), null, 5) else if(!check_plasma(emit_cost)) @@ -367,7 +367,7 @@ return use_plasma(emit_cost) current_aura = pheromone - visible_message(SPAN_XENOWARNING("\The [src] begins to emit strange-smelling pheromones."), \ + visible_message(SPAN_XENOWARNING("\The [src] begins to emit strange-smelling pheromones."), SPAN_XENOWARNING("We begin to emit '[pheromone]' pheromones."), null, 5) SEND_SIGNAL(src, COMSIG_XENO_START_EMIT_PHEROMONES, pheromone) playsound(loc, "alien_drool", 25) @@ -778,7 +778,7 @@ if(xeno.ammo.pre_spit_warn) playsound(xeno.loc,"alien_drool", 55, 1) to_chat(xeno, SPAN_WARNING("We begin to prepare a large spit!")) - xeno.visible_message(SPAN_WARNING("[xeno] prepares to spit a massive glob!"),\ + xeno.visible_message(SPAN_WARNING("[xeno] prepares to spit a massive glob!"), SPAN_WARNING("We begin to spit [xeno.ammo.name]!")) if (!do_after(xeno, xeno.ammo.spit_windup, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_HOSTILE)) to_chat(xeno, SPAN_XENODANGER("We decide to cancel our spit.")) @@ -791,7 +791,7 @@ return xeno_cooldown = xeno.caste.spit_delay + xeno.ammo.added_spit_delay - xeno.visible_message(SPAN_XENOWARNING("[xeno] spits at [atom]!"), \ + xeno.visible_message(SPAN_XENOWARNING("[xeno] spits at [atom]!"), SPAN_XENOWARNING("We spit [xeno.ammo.name] at [atom]!") ) playsound(xeno.loc, sound_to_play, 25, 1) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm index 3c1d3a04543d..954d29953fa9 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm @@ -165,7 +165,7 @@ if (!action_cooldown_check()) return - xeno.visible_message(SPAN_DANGER("[xeno] drags its claws in a wide area in front of it!"), \ + xeno.visible_message(SPAN_DANGER("[xeno] drags its claws in a wide area in front of it!"), SPAN_XENOWARNING("We unleash a barrage of slashes!")) playsound(xeno, 'sound/effects/alien_tail_swipe2.ogg', 30) apply_cooldown() @@ -207,7 +207,7 @@ if (!isxeno_human(target) || xeno.can_not_harm(target)) continue - xeno.visible_message(SPAN_DANGER("[xeno] slashes [target]!"), \ + xeno.visible_message(SPAN_DANGER("[xeno] slashes [target]!"), SPAN_XENOWARNING("We slash [target] multiple times!")) xeno.flick_attack_overlay(target, "slash") target.last_damage_data = create_cause_data(xeno.caste_type, xeno) @@ -352,7 +352,7 @@ to_chat(xeno, SPAN_WARNING("We should not harm this host! It has a sister inside.")) return - xeno.visible_message(SPAN_DANGER("[xeno] grabs [target_carbon]’s head aggressively."), \ + xeno.visible_message(SPAN_DANGER("[xeno] grabs [target_carbon]’s head aggressively."), SPAN_XENOWARNING("We grab [target_carbon]’s head aggressively.")) if(!do_after(xeno, 0.8 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, numticks = 2)) // would be 0.75 but that doesn't really work with numticks diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm index 095f338c2a37..9f3b476cbe65 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm @@ -393,7 +393,7 @@ target_carbon.last_damage_data = create_cause_data(oppressor_user.caste_type, oppressor_user) - oppressor_user.visible_message(SPAN_XENOWARNING("\The [oppressor_user] hits [target_carbon] in the [target_limb? target_limb.display_name : "chest"] with a devastatingly powerful punch!"), \ + oppressor_user.visible_message(SPAN_XENOWARNING("\The [oppressor_user] hits [target_carbon] in the [target_limb? target_limb.display_name : "chest"] with a devastatingly powerful punch!"), SPAN_XENOWARNING("We hit [target_carbon] in the [target_limb ? target_limb.display_name : "chest"] with a devastatingly powerful punch!")) var/hitsound = pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg') playsound(target_carbon,hitsound, 50, 1) @@ -559,12 +559,12 @@ var/mob/living/carbon/human/Hu = target_carbon Hu.update_xeno_hostile_hud() - // Hmm today I will kill a marine while looking away from them + // Hmm todayvisible_message(SPAN_DANGER("\The [dancer_user] violently slices [target_atom] with its tail[buffed?" twice":""]!"), dancer_user.face_atom(target_atom) var/damage = get_xeno_damage_slash(target_carbon, rand(dancer_user.melee_damage_lower, dancer_user.melee_damage_upper)) - dancer_user.visible_message(SPAN_DANGER("\The [dancer_user] violently slices [target_atom] with its tail[buffed?" twice":""]!"), \ + dancer_user.visible_message(SPAN_DANGER("\The [dancer_user] violently slices [target_atom] with its tail[buffed?" twice":""]!"), SPAN_DANGER("We slice [target_atom] with our tail[buffed?" twice":""]!")) if(buffed) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm index 9c7f24776dc8..be3cad44922b 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm @@ -278,7 +278,7 @@ return if(should_neckgrab && living_mob.mob_size < MOB_SIZE_BIG) - visible_message(SPAN_XENOWARNING("[src] grabs [living_mob] by the back of their leg and slams them onto the ground!"), \ + visible_message(SPAN_XENOWARNING("[src] grabs [living_mob] by the back of their leg and slams them onto the ground!"), SPAN_XENOWARNING("We grab [living_mob] by the back of their leg and slam them onto the ground!")) // more flair smashing = TRUE living_mob.drop_held_items() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm index 5bfe1d7f9575..31175d40bc38 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm @@ -87,7 +87,7 @@ return if(!X.ovipositor) return - X.visible_message(SPAN_XENOWARNING("\The [X] starts detaching itself from its ovipositor!"), \ + X.visible_message(SPAN_XENOWARNING("\The [X] starts detaching itself from its ovipositor!"), SPAN_XENOWARNING("You start detaching yourself from your ovipositor.")) if(!do_after(X, 50, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, numticks = 10)) return if(!X.check_state()) @@ -138,7 +138,7 @@ if(!xeno.check_plasma(plasma_cost)) return - xeno.visible_message(SPAN_XENOWARNING("\The [xeno] starts to grow an ovipositor."), \ + xeno.visible_message(SPAN_XENOWARNING("\The [xeno] starts to grow an ovipositor."), SPAN_XENOWARNING("You start to grow an ovipositor...(takes 20 seconds, hold still)")) if(!do_after(xeno, 200, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY, numticks = 20) && xeno.check_plasma(plasma_cost)) return @@ -146,7 +146,7 @@ if(!locate(/obj/effect/alien/weeds) in current_turf) return xeno.use_plasma(plasma_cost) - xeno.visible_message(SPAN_XENOWARNING("\The [xeno] has grown an ovipositor!"), \ + xeno.visible_message(SPAN_XENOWARNING("\The [xeno] has grown an ovipositor!"), SPAN_XENOWARNING("You have grown an ovipositor!")) xeno.mount_ovipositor() return ..() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_powers.dm index f5e090bc7e4b..484bdd41d91c 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_powers.dm @@ -124,7 +124,7 @@ if(istype(affected_atom, /obj/vehicle/multitile)) var/obj/vehicle/multitile/multitile_vehicle = affected_atom multitile_vehicle.take_damage_type(20 / acid.acid_delay, "acid", src) - visible_message(SPAN_XENOWARNING("[src] vomits globs of vile stuff at [multitile_vehicle]. It sizzles under the bubbling mess of acid!"), \ + visible_message(SPAN_XENOWARNING("[src] vomits globs of vile stuff at [multitile_vehicle]. It sizzles under the bubbling mess of acid!"), SPAN_XENOWARNING("We vomit globs of vile stuff at [multitile_vehicle]. It sizzles under the bubbling mess of acid!"), null, 5) playsound(loc, "sound/bullets/acid_impact1.ogg", 25) QDEL_IN(acid, 20) @@ -133,7 +133,7 @@ acid.add_hiddenprint(src) acid.name += " ([affected_atom])" - visible_message(SPAN_XENOWARNING("[src] vomits globs of vile stuff all over [affected_atom]. It begins to sizzle and melt under the bubbling mess of acid!"), \ + visible_message(SPAN_XENOWARNING("[src] vomits globs of vile stuff all over [affected_atom]. It begins to sizzle and melt under the bubbling mess of acid!"), SPAN_XENOWARNING("We vomit globs of vile stuff all over [affected_atom]. It begins to sizzle and melt under the bubbling mess of acid!"), null, 5) playsound(loc, "sound/bullets/acid_impact1.ogg", 25) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm index 82be70d02231..daafc7f14e84 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm @@ -15,7 +15,7 @@ if (!check_and_use_plasma_owner()) return - slowspit_user.visible_message(SPAN_XENOWARNING("[slowspit_user] spits at [target]!"), \ + slowspit_user.visible_message(SPAN_XENOWARNING("[slowspit_user] spits at [target]!"), SPAN_XENOWARNING("You spit at [target]!") ) var/sound_to_play = pick(1, 2) == 1 ? 'sound/voice/alien_spitacid.ogg' : 'sound/voice/alien_spitacid2.ogg' playsound(slowspit_user.loc, sound_to_play, 25, 1) @@ -47,7 +47,7 @@ if (!check_and_use_plasma_owner()) return - scatterspit_user.visible_message(SPAN_XENOWARNING("[scatterspit_user] spits at [target]!"), \ + scatterspit_user.visible_message(SPAN_XENOWARNING("[scatterspit_user] spits at [target]!"), SPAN_XENOWARNING("You spit at [target]!") ) var/sound_to_play = pick(1, 2) == 1 ? 'sound/voice/alien_spitacid.ogg' : 'sound/voice/alien_spitacid2.ogg' playsound(scatterspit_user.loc, sound_to_play, 25, 1) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_powers.dm index e77c26e18ee7..61e753351238 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_powers.dm @@ -135,7 +135,7 @@ carbon.last_damage_data = create_cause_data(initial(punch_user.caste_type), punch_user) - punch_user.visible_message(SPAN_XENOWARNING("[punch_user] hits [carbon] in the [target_limb ? target_limb.display_name : "chest"] with a devastatingly powerful punch!"), \ + punch_user.visible_message(SPAN_XENOWARNING("[punch_user] hits [carbon] in the [target_limb ? target_limb.display_name : "chest"] with a devastatingly powerful punch!"), SPAN_XENOWARNING("We hit [carbon] in the [target_limb ? target_limb.display_name : "chest"] with a devastatingly powerful punch!")) var/sound = pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg') playsound(carbon, sound, 50, 1) diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm index cfed6878a9f4..2421b68f36d9 100644 --- a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm +++ b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm @@ -24,7 +24,7 @@ if(on_fire) extinguish_mob(attacking_xeno) else - attacking_xeno.visible_message(SPAN_NOTICE("[attacking_xeno] caresses [src] with its claws."), \ + attacking_xeno.visible_message(SPAN_NOTICE("[attacking_xeno] caresses [src] with its claws."), SPAN_NOTICE("We caress [src] with our claws."), null, 5, CHAT_TYPE_XENO_FLUFF) if(INTENT_GRAB) @@ -32,7 +32,7 @@ return XENO_NO_DELAY_ACTION if(check_shields(0, attacking_xeno.name)) // Blocking check - attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno]'s grab is blocked by [src]'s shield!"), \ + attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno]'s grab is blocked by [src]'s shield!"), SPAN_DANGER("Our grab was blocked by [src]'s shield!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION @@ -42,7 +42,7 @@ if(INTENT_HARM) if(attacking_xeno.can_not_harm(src)) attacking_xeno.animation_attack_on(src) - attacking_xeno.visible_message(SPAN_NOTICE("[attacking_xeno] nibbles [src]"), \ + attacking_xeno.visible_message(SPAN_NOTICE("[attacking_xeno] nibbles [src]"), SPAN_XENONOTICE("We nibble [src]")) return XENO_ATTACK_ACTION @@ -61,7 +61,7 @@ return XENO_NO_DELAY_ACTION if(check_shields(0, attacking_xeno.name)) // Blocking check - attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno]'s slash is blocked by [src]'s shield!"), \ + attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno]'s slash is blocked by [src]'s shield!"), SPAN_DANGER("Our slash is blocked by [src]'s shield!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION @@ -84,7 +84,7 @@ if(!damage) playsound(attacking_xeno.loc, 'sound/weapons/alien_claw_swipe.ogg', 25, 1) attacking_xeno.animation_attack_on(src) - attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno] lunges at [src]!"), \ + attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno] lunges at [src]!"), SPAN_DANGER("We lunge at [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION @@ -108,7 +108,7 @@ knock_chance += min(floor(damage * 0.25), 10) //Maximum of 15% chance. if(prob(knock_chance)) playsound(loc, "alien_claw_metal", 25, 1) - attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno] smashes off [src]'s [wear_mask.name]!"), \ + attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno] smashes off [src]'s [wear_mask.name]!"), SPAN_DANGER("We smash off [src]'s [wear_mask.name]!"), null, 5) drop_inv_item_on_ground(wear_mask) if(isyautja(src)) @@ -132,7 +132,7 @@ //The normal attack proceeds playsound(loc, slash_noise, 25, TRUE) - attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno] [attacking_xeno.slashes_verb] [src]!"), \ + attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno] [attacking_xeno.slashes_verb] [src]!"), SPAN_DANGER("We [attacking_xeno.slash_verb] [src]!"), null, null, CHAT_TYPE_XENO_COMBAT) handle_blood_splatter(get_dir(attacking_xeno.loc, src.loc)) @@ -182,7 +182,7 @@ attacking_xeno.animation_attack_on(src) if(check_shields(0, attacking_xeno.name)) // Blocking check - attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno]'s tackle is blocked by [src]'s shield!"), \ + attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno]'s tackle is blocked by [src]'s shield!"), SPAN_DANGER("We tackle is blocked by [src]'s shield!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION attacking_xeno.flick_attack_overlay(src, "disarm") @@ -201,13 +201,13 @@ var/strength = rand(attacking_xeno.tacklestrength_min, attacking_xeno.tacklestrength_max) Stun(strength) KnockDown(strength) // Purely for knockdown visuals. All the heavy lifting is done by Stun - attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno] tackles down [src]!"), \ + attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno] tackles down [src]!"), SPAN_DANGER("We tackle down [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) SEND_SIGNAL(src, COMSIG_MOB_TACKLED_DOWN, attacking_xeno) knocked_down = TRUE else playsound(loc, 'sound/weapons/alien_claw_swipe.ogg', 25, 1) - attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno] tries to tackle [src]!"), \ + attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno] tries to tackle [src]!"), SPAN_DANGER("We try to tackle [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) knocked_down = FALSE @@ -224,7 +224,7 @@ switch(M.a_intent) if(INTENT_HELP) - M.visible_message(SPAN_NOTICE("[M] caresses [src] with its claws."), \ + M.visible_message(SPAN_NOTICE("[M] caresses [src] with its claws."), SPAN_NOTICE("We caress [src] with our claws."), null, 5, CHAT_TYPE_XENO_FLUFF) if(INTENT_GRAB) @@ -238,7 +238,7 @@ if(isxeno(src) && xeno_hivenumber(src) == M.hivenumber) var/mob/living/carbon/xenomorph/X = src if(!X.banished) - M.visible_message(SPAN_WARNING("[M] nibbles [src]."), \ + M.visible_message(SPAN_WARNING("[M] nibbles [src]."), SPAN_WARNING("We nibble [src]."), null, 5, CHAT_TYPE_XENO_FLUFF) return XENO_ATTACK_ACTION @@ -256,13 +256,13 @@ if(!damage) playsound(M.loc, 'sound/weapons/alien_claw_swipe.ogg', 25, 1) - M.visible_message(SPAN_DANGER("[M] lunges at [src]!"), \ + M.visible_message(SPAN_DANGER("[M] lunges at [src]!"), SPAN_DANGER("We lunge at [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION handle_blood_splatter(get_dir(M.loc, loc)) last_damage_data = create_cause_data(initial(M.name), M) - M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] [src]!"), \ + M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] [src]!"), SPAN_DANGER("We [M.slash_verb] [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) attack_log += text("\[[time_stamp()]\] was [M.slash_verb]ed by [key_name(M)]") M.attack_log += text("\[[time_stamp()]\] [M.slash_verb]ed [key_name(src)]") @@ -277,14 +277,14 @@ if(INTENT_DISARM) playsound(loc, 'sound/weapons/alien_knockdown.ogg', 25, 1) - M.visible_message(SPAN_WARNING("[M] shoves [src]!"), \ + M.visible_message(SPAN_WARNING("[M] shoves [src]!"), SPAN_WARNING("We shove [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) if(ismonkey(src)) apply_effect(8, WEAKEN) return XENO_ATTACK_ACTION /mob/living/attack_larva(mob/living/carbon/xenomorph/larva/M) - M.visible_message(SPAN_DANGER("[M] nudges its head against [src]."), \ + M.visible_message(SPAN_DANGER("[M] nudges its head against [src]."), SPAN_DANGER("We nudge our head against [src]."), null, 5, CHAT_TYPE_XENO_FLUFF) M.animation_attack_on(src) @@ -328,11 +328,11 @@ playsound(src, 'sound/effects/metalhit.ogg', 25, 1) health -= rand(M.melee_damage_lower, M.melee_damage_upper) if(health <= 0) - M.visible_message(SPAN_DANGER("[M] slices [src] apart!"), \ + M.visible_message(SPAN_DANGER("[M] slices [src] apart!"), SPAN_DANGER("We slice [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) deconstruct(FALSE) else - M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] [src]!"), \ + M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] [src]!"), SPAN_DANGER("We [M.slash_verb] [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION @@ -343,10 +343,10 @@ if(barricade_hitsound) playsound(src, barricade_hitsound, 25, 1) if(health <= 0) - M.visible_message(SPAN_DANGER("[M] slices [src] apart!"), \ + M.visible_message(SPAN_DANGER("[M] slices [src] apart!"), SPAN_DANGER("We slice [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) else - M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] [src]!"), \ + M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] [src]!"), SPAN_DANGER("We [M.slash_verb] [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) if(is_wired) M.visible_message(SPAN_DANGER("The barbed wire slices into [M]!"), @@ -370,7 +370,7 @@ /obj/structure/surface/rack/attack_alien(mob/living/carbon/xenomorph/M) M.animation_attack_on(src) playsound(src, 'sound/effects/metalhit.ogg', 25, 1) - M.visible_message(SPAN_DANGER("[M] slices [src] apart!"), \ + M.visible_message(SPAN_DANGER("[M] slices [src] apart!"), SPAN_DANGER("We slice [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) deconstruct(FALSE) return XENO_ATTACK_ACTION @@ -422,7 +422,7 @@ if(is_broken()) //Ignore if broken. Note that we can't use defines here return FALSE M.animation_attack_on(src) - M.visible_message(SPAN_DANGER("[M] smashes [src]!"), \ + M.visible_message(SPAN_DANGER("[M] smashes [src]!"), SPAN_DANGER("We smash [src]!"), null, 5) broken() //Smashola! return XENO_ATTACK_ACTION @@ -431,8 +431,8 @@ /obj/structure/window/attack_alien(mob/living/carbon/xenomorph/M) if(M.a_intent == INTENT_HELP) playsound(loc, 'sound/effects/glassknock.ogg', 25, 1) - M.visible_message(SPAN_WARNING("[M] creepily taps on [src] with its huge claw."), \ - SPAN_WARNING("We creepily tap on [src]."), \ + M.visible_message(SPAN_WARNING("[M] creepily taps on [src] with its huge claw."), + SPAN_WARNING("We creepily tap on [src]."), SPAN_WARNING("You hear a glass tapping sound."), 5, CHAT_TYPE_XENO_COMBAT) else attack_generic(M, M.melee_damage_lower) @@ -443,10 +443,10 @@ M.animation_attack_on(src) health -= rand(15, 30) if(health <= 0) - M.visible_message(SPAN_DANGER("[M] slices [src] apart!"), \ + M.visible_message(SPAN_DANGER("[M] slices [src] apart!"), SPAN_DANGER("We slice [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) else - M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] [src]!"), \ + M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] [src]!"), SPAN_DANGER("We [M.slash_verb] [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) playsound(loc, "alien_claw_metal", 25, 1) if(prob(10)) @@ -457,7 +457,7 @@ //Slashing cameras /obj/structure/machinery/camera/attack_alien(mob/living/carbon/xenomorph/M) if(status) - M.visible_message(SPAN_DANGER("[M] slices [src] apart!"), \ + M.visible_message(SPAN_DANGER("[M] slices [src] apart!"), SPAN_DANGER("We slice [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) playsound(loc, "alien_claw_metal", 25, 1) wires = 0 //wires all cut @@ -469,7 +469,7 @@ /obj/structure/machinery/door/window/attack_alien(mob/living/carbon/xenomorph/M) M.animation_attack_on(src) playsound(loc, 'sound/effects/Glasshit.ogg', 25, 1) - M.visible_message(SPAN_DANGER("[M] smashes against [src]!"), \ + M.visible_message(SPAN_DANGER("[M] smashes against [src]!"), SPAN_DANGER("We smash against [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) var/damage = 25 if(M.mob_size >= MOB_SIZE_BIG) @@ -482,13 +482,13 @@ M.animation_attack_on(src) playsound(loc, 'sound/effects/grillehit.ogg', 25, 1) var/damage_dealt = 5 - M.visible_message(SPAN_DANGER("[M] mangles [src]!"), \ - SPAN_DANGER("We mangle [src]!"), \ + M.visible_message(SPAN_DANGER("[M] mangles [src]!"), + SPAN_DANGER("We mangle [src]!"), SPAN_DANGER("We hear twisting metal!"), 5, CHAT_TYPE_XENO_COMBAT) if(shock(M, 70)) - M.visible_message(SPAN_DANGER("ZAP! [M] spazzes wildly amongst a smell of burnt ozone."), \ - SPAN_DANGER("ZAP! You twitch and dance like a monkey on hyperzine!"), \ + M.visible_message(SPAN_DANGER("ZAP! [M] spazzes wildly amongst a smell of burnt ozone."), + SPAN_DANGER("ZAP! You twitch and dance like a monkey on hyperzine!"), SPAN_DANGER("You hear a sharp ZAP and a smell of ozone.")) return XENO_NO_DELAY_ACTION //Intended apparently ? @@ -500,8 +500,8 @@ /obj/structure/fence/attack_alien(mob/living/carbon/xenomorph/M) M.animation_attack_on(src) var/damage_dealt = 25 - M.visible_message(SPAN_DANGER("[M] mangles [src]!"), \ - SPAN_DANGER("We mangle [src]!"), \ + M.visible_message(SPAN_DANGER("[M] mangles [src]!"), + SPAN_DANGER("We mangle [src]!"), SPAN_DANGER("We hear twisting metal!"), 5, CHAT_TYPE_XENO_COMBAT) health -= damage_dealt @@ -522,11 +522,11 @@ return XENO_ATTACK_ACTION if(M.a_intent == INTENT_HELP) - M.visible_message(SPAN_WARNING("[M] ogles its own reflection in [src]."), \ + M.visible_message(SPAN_WARNING("[M] ogles its own reflection in [src]."), SPAN_WARNING("We ogle our own reflection in [src]."), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_NONCOMBAT_ACTION else - M.visible_message(SPAN_DANGER("[M] smashes [src]!"), \ + M.visible_message(SPAN_DANGER("[M] smashes [src]!"), SPAN_DANGER("We smash [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) shatter() return XENO_ATTACK_ACTION @@ -584,7 +584,7 @@ delay = 4 SECONDS playsound(loc, "alien_doorpry", 25, TRUE) - M.visible_message(SPAN_WARNING("[M] digs into [src] and begins to pry it open."), \ + M.visible_message(SPAN_WARNING("[M] digs into [src] and begins to pry it open."), SPAN_WARNING("We dig into [src] and begin to pry it open."), null, 5, CHAT_TYPE_XENO_COMBAT) xeno_attack_delay(M) @@ -602,7 +602,7 @@ if(density) //Make sure it's still closed spawn(0) open(1) - M.visible_message(SPAN_DANGER("[M] pries [src] open."), \ + M.visible_message(SPAN_DANGER("[M] pries [src] open."), SPAN_DANGER("We pry [src] open."), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_NO_DELAY_ACTION @@ -622,7 +622,7 @@ return XENO_NO_DELAY_ACTION playsound(loc, 'sound/effects/metal_creaking.ogg', 25, 1) - M.visible_message(SPAN_WARNING("[M] digs into [src] and begins to pry it open."), \ + M.visible_message(SPAN_WARNING("[M] digs into [src] and begins to pry it open."), SPAN_WARNING("We dig into [src] and begin to pry it open."), null, 5, CHAT_TYPE_XENO_COMBAT) xeno_attack_delay(M) @@ -635,7 +635,7 @@ if(density) //Make sure it's still closed spawn(0) open(1) - M.visible_message(SPAN_DANGER("[M] pries [src] open."), \ + M.visible_message(SPAN_DANGER("[M] pries [src] open."), SPAN_DANGER("We pry [src] open."), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_NO_DELAY_ACTION @@ -658,7 +658,7 @@ if(islarva(M)) return else - M.visible_message(SPAN_XENONOTICE("[M] claws [src]!"), \ + M.visible_message(SPAN_XENONOTICE("[M] claws [src]!"), SPAN_XENONOTICE("We claw [src]."), null, null, CHAT_TYPE_XENO_COMBAT) playsound(loc, "alien_resin_break", 25) @@ -682,12 +682,12 @@ playsound(src, 'sound/effects/metalhit.ogg', 25, 1) update_health(rand(M.melee_damage_lower, M.melee_damage_upper)) if(health <= 0) - M.visible_message(SPAN_DANGER("[M] slices \the [src] apart!"), \ + M.visible_message(SPAN_DANGER("[M] slices \the [src] apart!"), SPAN_DANGER("We slice \the [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) if(!unacidable) qdel(src) else - M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] \the [src]!"), \ + M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] \the [src]!"), SPAN_DANGER("We [M.slash_verb] \the [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION @@ -701,12 +701,12 @@ playsound(src, 'sound/effects/metalhit.ogg', 25, 1) update_health(rand(M.melee_damage_lower, M.melee_damage_upper)) if(health <= 0) - M.visible_message(SPAN_DANGER("[M] slices \the [src] apart!"), \ + M.visible_message(SPAN_DANGER("[M] slices \the [src] apart!"), SPAN_DANGER("We slice \the [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) if(!unacidable) qdel(src) else - M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] \the [src]!"), \ + M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] \the [src]!"), SPAN_DANGER("We [M.slash_verb] \the [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION @@ -720,12 +720,12 @@ playsound(src, 'sound/effects/metalhit.ogg', 25, 1) update_health(rand(M.melee_damage_lower, M.melee_damage_upper)) if(health <= 0) - M.visible_message(SPAN_DANGER("[M] slices \the [src] apart!"), \ + M.visible_message(SPAN_DANGER("[M] slices \the [src] apart!"), SPAN_DANGER("We slice \the [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) if(!unacidable) qdel(src) else - M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] \the [src]!"), \ + M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] \the [src]!"), SPAN_DANGER("We [M.slash_verb] \the [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION @@ -740,11 +740,11 @@ playsound(src, 'sound/effects/metalhit.ogg', 25, 1) update_health(rand(alien.melee_damage_lower, alien.melee_damage_upper)) if(health <= 0) - alien.visible_message(SPAN_DANGER("[alien] slices \the [src] apart!"), \ + alien.visible_message(SPAN_DANGER("[alien] slices \the [src] apart!"), SPAN_DANGER("We slice \the [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) new /obj/item/stack/sheet/metal(destroyloc, 2) else - alien.visible_message(SPAN_DANGER("[alien] [alien.slashes_verb] \the [src]!"), \ + alien.visible_message(SPAN_DANGER("[alien] [alien.slashes_verb] \the [src]!"), SPAN_DANGER("We [alien.slash_verb] \the [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION @@ -758,12 +758,12 @@ playsound(src, 'sound/effects/metalhit.ogg', 25, 1) update_health(rand(alien.melee_damage_lower, alien.melee_damage_upper)) if(health <= 0) - alien.visible_message(SPAN_DANGER("[alien] slices \the [src] apart!"), \ + alien.visible_message(SPAN_DANGER("[alien] slices \the [src] apart!"), SPAN_DANGER("We slice \the [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) if(!unacidable) qdel(src) else - alien.visible_message(SPAN_DANGER("[alien] [alien.slashes_verb] \the [src]!"), \ + alien.visible_message(SPAN_DANGER("[alien] [alien.slashes_verb] \the [src]!"), SPAN_DANGER("We [alien.slash_verb] \the [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION @@ -833,7 +833,7 @@ to_chat(M, SPAN_XENONOTICE("We aren't big enough to further damage [src].")) return XENO_NO_DELAY_ACTION M.animation_attack_on(src) - M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] [src]!"), \ + M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] [src]!"), SPAN_DANGER("We [M.slash_verb] [src]!"), null, 5) playsound(loc, "alien_claw_metal", 25, 1) if (beenhit >= XENO_HITS_TO_CUT_WIRES) @@ -919,10 +919,10 @@ difficulty = 30 // if its welded shut it should be harder to smash open if(prob(difficulty)) break_open() - M.visible_message(SPAN_DANGER("[M] smashes \the [src] open!"), \ + M.visible_message(SPAN_DANGER("[M] smashes \the [src] open!"), SPAN_DANGER("We smash \the [src] open!"), null, 5, CHAT_TYPE_XENO_COMBAT) else - M.visible_message(SPAN_DANGER("[M] smashes [src]!"), \ + M.visible_message(SPAN_DANGER("[M] smashes [src]!"), SPAN_DANGER("We smash [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION @@ -933,12 +933,12 @@ M.animation_attack_on(src) health -= floor(rand(M.melee_damage_lower, M.melee_damage_upper) * 0.5) if(health <= 0) - M.visible_message(SPAN_DANGER("[M] smashes [src] apart!"), \ + M.visible_message(SPAN_DANGER("[M] smashes [src] apart!"), SPAN_DANGER("We slice [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) playsound(loc, 'sound/effects/metalhit.ogg', 25, TRUE) dismantle() else - M.visible_message(SPAN_DANGER("[M] smashes [src]!"), \ + M.visible_message(SPAN_DANGER("[M] smashes [src]!"), SPAN_DANGER("We [M.slash_verb] [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) playsound(loc, 'sound/effects/metalhit.ogg', 25, TRUE) return XENO_ATTACK_ACTION @@ -952,18 +952,18 @@ M.animation_attack_on(src) if(prob(M.melee_damage_lower)) playsound(loc, 'sound/effects/metalhit.ogg', 25, 1) - M.visible_message(SPAN_DANGER("[M] smashes [src] beyond recognition!"), \ + M.visible_message(SPAN_DANGER("[M] smashes [src] beyond recognition!"), SPAN_DANGER("We enter a frenzy and smash [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) malfunction() else - M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] [src]!"), \ + M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] [src]!"), SPAN_DANGER("We [M.slash_verb] [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) playsound(loc, 'sound/effects/metalhit.ogg', 25, 1) return XENO_ATTACK_ACTION if(M.action_busy) return XENO_NO_DELAY_ACTION - M.visible_message(SPAN_WARNING("[M] begins to lean against [src]."), \ + M.visible_message(SPAN_WARNING("[M] begins to lean against [src]."), SPAN_WARNING("We begin to lean against [src]."), null, 5, CHAT_TYPE_XENO_COMBAT) var/shove_time = 100 if(M.mob_size >= MOB_SIZE_BIG) @@ -975,7 +975,7 @@ if(do_after(M, shove_time, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) M.animation_attack_on(src) - M.visible_message(SPAN_DANGER("[M] knocks [src] down!"), \ + M.visible_message(SPAN_DANGER("[M] knocks [src] down!"), SPAN_DANGER("We knock [src] down!"), null, 5, CHAT_TYPE_XENO_COMBAT) tip_over() return XENO_NO_DELAY_ACTION @@ -1005,7 +1005,7 @@ //Misc /obj/structure/prop/invuln/joey/attack_alien(mob/living/carbon/xenomorph/alien) alien.animation_attack_on(src) - alien.visible_message(SPAN_DANGER("[alien] [alien.slashes_verb] [src]!"), \ + alien.visible_message(SPAN_DANGER("[alien] [alien.slashes_verb] [src]!"), SPAN_DANGER("We [alien.slash_verb] [src]!"), null, 5) playsound(loc, "alien_claw_metal", 25, 1) attacked() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm b/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm index a6847d010fd2..08b5a9b28deb 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm @@ -308,7 +308,7 @@ A.update_button_icon() drop_inv_item_on_ground(F) F.throw_atom(T, 4, caste.throwspeed) - visible_message(SPAN_XENOWARNING("\The [src] throws something towards \the [T]!"), \ + visible_message(SPAN_XENOWARNING("\The [src] throws something towards \the [T]!"), SPAN_XENOWARNING("We throw a facehugger towards \the [T]!")) spawn(caste.hugger_delay) threw_a_hugger = 0 diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm b/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm index ddb954465e23..3c8caab886a4 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm @@ -246,7 +246,7 @@ cdr_amount += 5 - bound_xeno.visible_message(SPAN_DANGER("[bound_xeno] slashes [H]!"), \ + bound_xeno.visible_message(SPAN_DANGER("[bound_xeno] slashes [H]!"), SPAN_DANGER("You slash [H]!"), null, null, CHAT_TYPE_XENO_COMBAT) bound_xeno.flick_attack_overlay(H, "slash") diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm index 83e433b48b90..00d7a117aaa2 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm @@ -794,7 +794,7 @@ if(!check_plasma(200)) return FALSE - visible_message(SPAN_XENOWARNING("[src] begins slowly lifting [victim] into the air."), \ + visible_message(SPAN_XENOWARNING("[src] begins slowly lifting [victim] into the air."), SPAN_XENOWARNING("You begin focusing your anger as you slowly lift [victim] into the air.")) if(do_after(src, 80, INTERRUPT_ALL, BUSY_ICON_HOSTILE, victim)) if(!victim) @@ -806,7 +806,7 @@ use_plasma(200) - visible_message(SPAN_XENODANGER("[src] viciously smashes and wrenches [victim] apart!"), \ + visible_message(SPAN_XENODANGER("[src] viciously smashes and wrenches [victim] apart!"), SPAN_XENODANGER("You suddenly unleash pure anger on [victim], instantly wrenching \him apart!")) emote("roar") diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm b/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm index 9f19213b19a4..8782d1fd5804 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm @@ -105,7 +105,7 @@ living_mob.Stun(duration) if(living_mob.pulledby != src) return // Grab was broken, probably as Stun side effect (eg. target getting knocked away from a manned M56D) - visible_message(SPAN_XENOWARNING("[src] grabs [living_mob] by the throat!"), \ + visible_message(SPAN_XENOWARNING("[src] grabs [living_mob] by the throat!"), SPAN_XENOWARNING("We grab [living_mob] by the throat!")) lunging = TRUE addtimer(CALLBACK(src, PROC_REF(stop_lunging)), get_xeno_stun_duration(living_mob, 2) SECONDS + 1 SECONDS) @@ -201,7 +201,7 @@ if(limb.body_part == BODY_FLAG_HEAD) limb_time = rand(90,110) - visible_message(SPAN_XENOWARNING("[src] begins pulling on [mob]'s [limb.display_name] with incredible strength!"), \ + visible_message(SPAN_XENOWARNING("[src] begins pulling on [mob]'s [limb.display_name] with incredible strength!"), SPAN_XENOWARNING("We begin to pull on [mob]'s [limb.display_name] with incredible strength!")) if(!do_after(src, limb_time, INTERRUPT_ALL|INTERRUPT_DIFF_SELECT_ZONE, BUSY_ICON_HOSTILE) || mob.stat == DEAD || mob.status_flags & XENO_HOST) @@ -215,10 +215,10 @@ if(limb.status & (LIMB_ROBOT|LIMB_SYNTHSKIN)) limb.take_damage(rand(30,40), 0, 0) // just do more damage - visible_message(SPAN_XENOWARNING("You hear [mob]'s [limb.display_name] being pulled beyond its load limits!"), \ + visible_message(SPAN_XENOWARNING("You hear [mob]'s [limb.display_name] being pulled beyond its load limits!"), SPAN_XENOWARNING("[mob]'s [limb.display_name] begins to tear apart!")) else - visible_message(SPAN_XENOWARNING("We hear the bones in [mob]'s [limb.display_name] snap with a sickening crunch!"), \ + visible_message(SPAN_XENOWARNING("We hear the bones in [mob]'s [limb.display_name] snap with a sickening crunch!"), SPAN_XENOWARNING("[mob]'s [limb.display_name] bones snap with a satisfying crunch!")) limb.take_damage(rand(15,25), 0, 0) limb.fracture(100) @@ -234,7 +234,7 @@ if(limb.status & LIMB_DESTROYED) return FALSE - visible_message(SPAN_XENOWARNING("[src] rips [mob]'s [limb.display_name] away from their body!"), \ + visible_message(SPAN_XENOWARNING("[src] rips [mob]'s [limb.display_name] away from their body!"), SPAN_XENOWARNING("[mob]'s [limb.display_name] rips away from their body!")) src.attack_log += text("\[[time_stamp()]\] ripped the [limb.display_name] off of [mob.name] ([mob.ckey]) 2/2 progress") mob.attack_log += text("\[[time_stamp()]\] had their [limb.display_name] ripped off by [src.name] ([src.ckey]) 2/2 progress") diff --git a/code/modules/mob/living/carbon/xenomorph/damage_procs.dm b/code/modules/mob/living/carbon/xenomorph/damage_procs.dm index 9d4de90072aa..11d65d1bb0ff 100644 --- a/code/modules/mob/living/carbon/xenomorph/damage_procs.dm +++ b/code/modules/mob/living/carbon/xenomorph/damage_procs.dm @@ -281,7 +281,7 @@ if(SEND_SIGNAL(src, COMSIG_XENO_DEAL_ACID_DAMAGE, victim, dmg) & COMPONENT_BLOCK_DAMAGE) continue i++ - victim.visible_message(SPAN_DANGER("\The [victim] is scalded with hissing green blood!"), \ + victim.visible_message(SPAN_DANGER("\The [victim] is scalded with hissing green blood!"), SPAN_DANGER("You are splattered with sizzling blood! IT BURNS!")) if(prob(60) && !victim.stat && victim.pain.feels_pain) INVOKE_ASYNC(victim, TYPE_PROC_REF(/mob, emote), "scream") //Topkek diff --git a/code/modules/mob/living/carbon/xenomorph/egg_item.dm b/code/modules/mob/living/carbon/xenomorph/egg_item.dm index 75b141f9785c..68be919ae1d4 100644 --- a/code/modules/mob/living/carbon/xenomorph/egg_item.dm +++ b/code/modules/mob/living/carbon/xenomorph/egg_item.dm @@ -74,7 +74,7 @@ to_chat(user, SPAN_WARNING("The floor needs to be clear to plant this!")) return - user.visible_message(SPAN_NOTICE("[user] starts planting [src]."), \ + user.visible_message(SPAN_NOTICE("[user] starts planting [src]."), SPAN_NOTICE("You start planting [src]."), null, 5) if(!do_after(user, 50, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) return diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/gardener.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/gardener.dm index 87b8aeafc49e..654bd7f46bf5 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/gardener.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/gardener.dm @@ -99,7 +99,7 @@ xeno.current_fruits.Remove(old_fruit) qdel(old_fruit) - xeno.visible_message(SPAN_XENONOTICE("\The [xeno] secretes fluids and shape it into a fruit!"), \ + xeno.visible_message(SPAN_XENONOTICE("\The [xeno] secretes fluids and shape it into a fruit!"), SPAN_XENONOTICE("We secrete a portion of our vital fluids and shape them into a fruit!"), null, 5) var/obj/effect/alien/resin/fruit/fruit = new xeno.selected_fruit(target_weeds.loc, target_weeds, xeno) @@ -280,7 +280,7 @@ if(!buff_already_present) new /datum/effects/xeno_structure_reinforcement(structure_to_buff, xeno, ttl = 15 SECONDS) - xeno.visible_message(SPAN_XENODANGER("\The [xeno] surges the resin around [structure_to_buff], making it temporarily nigh unbreakable!"), \ + xeno.visible_message(SPAN_XENODANGER("\The [xeno] surges the resin around [structure_to_buff], making it temporarily nigh unbreakable!"), SPAN_XENONOTICE("We surge the resin around [structure_to_buff], making it temporarily nigh unbreakable!"), null, 5) else to_chat(xeno, SPAN_XENONOTICE("We haplessly try to surge resin around [structure_to_buff], but it's already reinforced. It'll take a moment for us to recover.")) @@ -295,7 +295,7 @@ F.reduce_timer(5 SECONDS) else if(target_weeds && istype(target_turf, /turf/open) && target_weeds.hivenumber == xeno.hivenumber) - xeno.visible_message(SPAN_XENODANGER("\The [xeno] surges the resin, creating an unstable wall!"), \ + xeno.visible_message(SPAN_XENODANGER("\The [xeno] surges the resin, creating an unstable wall!"), SPAN_XENONOTICE("We surge the resin, creating an unstable wall!"), null, 5) target_turf.PlaceOnTop(/turf/closed/wall/resin/weak) var/turf/closed/wall/resin/weak_wall = target_turf @@ -310,7 +310,7 @@ channel_in_progress = FALSE return channel_in_progress = FALSE - xeno.visible_message(SPAN_XENODANGER("\The [xeno] surges deep resin, creating an unstable sticky resin patch!"), \ + xeno.visible_message(SPAN_XENODANGER("\The [xeno] surges deep resin, creating an unstable sticky resin patch!"), SPAN_XENONOTICE("We surge the deep resin, creating an unstable sticky resin patch!"), null, 5) for (var/turf/targetTurf in orange(1, target_turf)) if(!locate(/obj/effect/alien/resin/sticky) in targetTurf) diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 745b169a6e76..23c24be44d01 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -151,7 +151,7 @@ /mob/living/simple_animal/cow/attack_hand(mob/living/carbon/M as mob) if(!stat && M.a_intent == INTENT_DISARM && icon_state != icon_dead) - M.visible_message(SPAN_WARNING("[M] tips over [src]."), \ + M.visible_message(SPAN_WARNING("[M] tips over [src]."), SPAN_NOTICE("You tip over [src].")) apply_effect(30, WEAKEN) icon_state = icon_dead diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/giant_lizard.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/giant_lizard.dm index 95e33bd157f0..6efaa16d9d91 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/giant_lizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/giant_lizard.dm @@ -337,10 +337,10 @@ if(on_fire) adjust_fire_stacks(-5, min_stacks = 0) playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7) - visible_message(SPAN_DANGER("[attacking_mob] tries to put out the fire on [src]!"), \ + visible_message(SPAN_DANGER("[attacking_mob] tries to put out the fire on [src]!"), SPAN_WARNING("You try to put out the fire on [src]!"), null, 5) if(fire_stacks <= 0) - visible_message(SPAN_DANGER("[attacking_mob] has successfully extinguished the fire on [src]!"), \ + visible_message(SPAN_DANGER("[attacking_mob] has successfully extinguished the fire on [src]!"), SPAN_NOTICE("You extinguished the fire on [src]."), null, 5) return if(!resting) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index 101d9af71bdf..bb59c39b2a7e 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -139,7 +139,7 @@ to_chat(xeno, SPAN_WARNING("We are already busy with something.")) return SEND_SIGNAL(xeno, COMSIG_MOB_EFFECT_CLOAK_CANCEL) - xeno.visible_message(SPAN_DANGER("[xeno] starts to devour [pulled]!"), \ + xeno.visible_message(SPAN_DANGER("[xeno] starts to devour [pulled]!"), SPAN_DANGER("We start to devour [pulled]!"), null, 5) if(HAS_TRAIT(xeno, TRAIT_CLOAKED)) //cloaked don't show the visible message, so we gotta work around to_chat(pulled, FONT_SIZE_HUGE(SPAN_DANGER("[xeno] is trying to devour you!"))) @@ -151,7 +151,7 @@ if(SEND_SIGNAL(pulled, COMSIG_MOB_DEVOURED, xeno) & COMPONENT_CANCEL_DEVOUR) return FALSE - xeno.visible_message(SPAN_WARNING("[xeno] devours [pulled]!"), \ + xeno.visible_message(SPAN_WARNING("[xeno] devours [pulled]!"), SPAN_WARNING("We devour [pulled]!"), null, 5) log_interact(xeno, pulled, "[key_name(xeno)] devoured [key_name(pulled)] at [get_area_name(xeno)]") diff --git a/code/modules/organs/limb_objects.dm b/code/modules/organs/limb_objects.dm index 384a6cad8217..52065825d246 100644 --- a/code/modules/organs/limb_objects.dm +++ b/code/modules/organs/limb_objects.dm @@ -167,14 +167,14 @@ if(istype(W,/obj/item/tool/surgery/scalpel)) switch(brain_op_stage) if(0) - user.visible_message(SPAN_WARNING("[brainmob] is beginning to have \his head cut open with [W] by [user]."), \ + user.visible_message(SPAN_WARNING("[brainmob] is beginning to have \his head cut open with [W] by [user]."), SPAN_WARNING("You cut [brainmob]'s head open with [W]!")) to_chat(brainmob, SPAN_WARNING("[user] begins to cut open your head with [W]!")) brain_op_stage = 1 if(2) - user.visible_message(SPAN_WARNING("[brainmob] is having \his connections to the brain delicately severed with [W] by [user]."), \ + user.visible_message(SPAN_WARNING("[brainmob] is having \his connections to the brain delicately severed with [W] by [user]."), SPAN_WARNING("You cut [brainmob]'s head open with [W]!")) to_chat(brainmob, SPAN_WARNING("[user] begins to cut open your head with [W]!")) @@ -184,12 +184,12 @@ else if(istype(W,/obj/item/tool/surgery/circular_saw)) switch(brain_op_stage) if(1) - user.visible_message(SPAN_WARNING("[brainmob] has \his head sawed open with [W] by [user]."), \ + user.visible_message(SPAN_WARNING("[brainmob] has \his head sawed open with [W] by [user]."), SPAN_WARNING("You saw [brainmob]'s head open with [W]!")) to_chat(brainmob, SPAN_WARNING("[user] saw open your head with [W]!")) brain_op_stage = 2 if(3) - user.visible_message(SPAN_WARNING("[brainmob] has \his spine's connection to the brain severed with [W] by [user]."), \ + user.visible_message(SPAN_WARNING("[brainmob] has \his spine's connection to the brain severed with [W] by [user]."), SPAN_WARNING("You sever [brainmob]'s brain's connection to the spine with [W]!")) to_chat(brainmob, SPAN_WARNING("[user] severs your brain's connection to the spine with [W]!")) diff --git a/code/modules/organs/limbs.dm b/code/modules/organs/limbs.dm index d8eb0bb42d27..d1e95390b5ad 100644 --- a/code/modules/organs/limbs.dm +++ b/code/modules/organs/limbs.dm @@ -1007,15 +1007,15 @@ This function completely restores a damaged organ to perfect condition. if(!owner) return if (owner.handcuffed && (body_part in list(BODY_FLAG_ARM_LEFT, BODY_FLAG_ARM_RIGHT, BODY_FLAG_HAND_LEFT, BODY_FLAG_HAND_RIGHT))) - owner.visible_message(\ - "\The [owner.handcuffed.name] falls off of [owner.name].",\ + owner.visible_message( + "\The [owner.handcuffed.name] falls off of [owner.name].", "\The [owner.handcuffed.name] falls off you.") owner.drop_inv_item_on_ground(owner.handcuffed) if (owner.legcuffed && (body_part in list(BODY_FLAG_FOOT_LEFT, BODY_FLAG_FOOT_RIGHT, BODY_FLAG_LEG_LEFT, BODY_FLAG_LEG_RIGHT))) - owner.visible_message(\ - "\The [owner.legcuffed.name] falls off of [owner.name].",\ + owner.visible_message( + "\The [owner.legcuffed.name] falls off of [owner.name].", "\The [owner.legcuffed.name] falls off you.") owner.drop_inv_item_on_ground(owner.legcuffed) @@ -1096,7 +1096,7 @@ treat_grafted var tells it to apply to grafted but unsalved wounds, for burn kit return if(owner.status_flags & NO_PERMANENT_DAMAGE) - owner.visible_message(\ + owner.visible_message( SPAN_WARNING("[owner] withstands the blow!"), SPAN_WARNING("Your [display_name] withstands the blow!")) return @@ -1123,7 +1123,7 @@ treat_grafted var tells it to apply to grafted but unsalved wounds, for burn kit if(prob(bonebreak_probability)) owner.recalculate_move_delay = TRUE if(status & (LIMB_ROBOT)) - owner.visible_message(\ + owner.visible_message( SPAN_WARNING("You see sparks coming from [owner]'s [display_name]!"), SPAN_HIGHDANGER("Something feels like it broke in your [display_name] as it spits out sparks!"), SPAN_HIGHDANGER("You hear electrical sparking!")) @@ -1133,7 +1133,7 @@ treat_grafted var tells it to apply to grafted but unsalved wounds, for burn kit spark_system.start() QDEL_IN(spark_system, 1 SECONDS) else - owner.visible_message(\ + owner.visible_message( SPAN_WARNING("You hear a loud cracking sound coming from [owner]!"), SPAN_HIGHDANGER("Something feels like it shattered in your [display_name]!"), SPAN_HIGHDANGER("You hear a sickening crack!")) @@ -1153,7 +1153,7 @@ treat_grafted var tells it to apply to grafted but unsalved wounds, for burn kit broken_description = pick("broken","fracture","hairline fracture") perma_injury = min_broken_damage else - owner.visible_message(\ + owner.visible_message( SPAN_WARNING("[owner] seems to withstand the blow!"), SPAN_WARNING("Your [display_name] manages to withstand the blow!")) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 65e770295cc5..a24545d7e903 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -148,7 +148,7 @@ /obj/item/paper/attack(mob/living/carbon/M, mob/living/carbon/user) if(user.zone_selected == "eyes") - user.visible_message(SPAN_NOTICE("You show the paper to [M]. "), \ + user.visible_message(SPAN_NOTICE("You show the paper to [M]. "), SPAN_NOTICE(" [user] holds up a paper and shows it to [M]. ")) examine(M) @@ -160,10 +160,10 @@ H.lip_style = null H.update_body() else - user.visible_message(SPAN_WARNING("[user] begins to wipe [H]'s face paint off with \the [src]."), \ + user.visible_message(SPAN_WARNING("[user] begins to wipe [H]'s face paint off with \the [src]."), SPAN_NOTICE("You begin to wipe off [H]'s face paint.")) if(do_after(user, 10, INTERRUPT_ALL, BUSY_ICON_FRIENDLY) && do_after(H, 10, INTERRUPT_ALL, BUSY_ICON_GENERIC)) //user needs to keep their active hand, H does not. - user.visible_message(SPAN_NOTICE("[user] wipes [H]'s face paint off with \the [src]."), \ + user.visible_message(SPAN_NOTICE("[user] wipes [H]'s face paint off with \the [src]."), SPAN_NOTICE("You wipe off [H]'s face paint.")) H.lip_style = null H.update_body() @@ -346,12 +346,12 @@ if(istype(P, /obj/item/tool/lighter/zippo)) class = "" - user.visible_message("[class][user] holds \the [P] up to \the [src], it looks like \he's trying to burn it!", \ + user.visible_message("[class][user] holds \the [P] up to \the [src], it looks like \he's trying to burn it!", "[class]You hold \the [P] up to \the [src], burning it slowly.") spawn(20) if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.heat_source) - user.visible_message("[class][user] burns right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.", \ + user.visible_message("[class][user] burns right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.", "[class]You burn right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.") if(user.get_inactive_hand() == src) diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index f47f2ab5c5a0..4ad6fc4185d5 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -60,12 +60,12 @@ if(istype(P, /obj/item/tool/lighter/zippo)) class = "" - user.visible_message("[class][user] holds \the [P] up to \the [src], it looks like \he's trying to burn it!", \ + user.visible_message("[class][user] holds \the [P] up to \the [src], it looks like \he's trying to burn it!", "[class]You hold \the [P] up to \the [src], burning it slowly.") spawn(20) if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.heat_source) - user.visible_message("[class][user] burns right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.", \ + user.visible_message("[class][user] burns right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.", "[class]You burn right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.") if(user.get_inactive_hand() == src) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 5f78c063ecec..190a7dbaffea 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -428,7 +428,7 @@ return xeno.animation_attack_on(src) playsound(src, 'sound/effects/metalhit.ogg', 25, 1) - xeno.visible_message(SPAN_DANGER("[xeno] [xeno.slashes_verb] [src]!"), \ + xeno.visible_message(SPAN_DANGER("[xeno] [xeno.slashes_verb] [src]!"), SPAN_DANGER("We [xeno.slash_verb] [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) turn_off(xeno) return XENO_ATTACK_ACTION diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 43c4eeb9efa6..2334806fc9f7 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -623,7 +623,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( return if(user.drop_inv_item_to_loc(W, src)) cell = W - user.visible_message(SPAN_NOTICE("[user] inserts [W] into [src]!"), \ + user.visible_message(SPAN_NOTICE("[user] inserts [W] into [src]!"), SPAN_NOTICE("You insert [W] into [src]!")) chargecount = 0 update_icon() @@ -791,7 +791,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( else if(((stat & BROKEN)) && !opened && W.force >= 5) opened = APC_COVER_REMOVED - user.visible_message(SPAN_WARNING("[user] knocks down [src]'s cover with [W]!"), \ + user.visible_message(SPAN_WARNING("[user] knocks down [src]'s cover with [W]!"), SPAN_WARNING("You knock down [src]'s cover with [W]!")) update_icon() else @@ -799,7 +799,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( return attack_hand(user) if(!opened && wiresexposed && (HAS_TRAIT(W, TRAIT_TOOL_MULTITOOL) || HAS_TRAIT(W, TRAIT_TOOL_WIRECUTTERS))) return attack_hand(user) - user.visible_message(SPAN_DANGER("[user] hits [src] with \the [W]!"), \ + user.visible_message(SPAN_DANGER("[user] hits [src] with \the [W]!"), SPAN_DANGER("You hit [src] with \the [W]!")) /obj/structure/machinery/power/apc/deconstruct(disassembled = TRUE) diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm index d6b31b8c0c1d..f351f2e04507 100644 --- a/code/modules/power/breaker_box.dm +++ b/code/modules/power/breaker_box.dm @@ -58,8 +58,8 @@ if(do_after(user, 300, INTERRUPT_NO_NEEDHAND|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) // 30s for non-AIs as humans have to manually reprogram it and rapid switching may cause some lag / powernet updates flood. If AIs spam it they can be easily traced. set_state(!on) - user.visible_message(\ - SPAN_NOTICE("[user.name] [on ? "enabled" : "disabled"] the breaker box!"),\ + user.visible_message( + SPAN_NOTICE("[user.name] [on ? "enabled" : "disabled"] the breaker box!"), SPAN_NOTICE("You [on ? "enabled" : "disabled"] the breaker box!")) busy = FALSE diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 873621e2a572..ac5038c8c344 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -56,7 +56,7 @@ to_chat(usr, "You begin deconstructing [src].") if (!do_after(usr, 30, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) return - user.visible_message("[user.name] deconstructs [src].", \ + user.visible_message("[user.name] deconstructs [src].", "You deconstruct [src].", "You hear a noise.") playsound(src.loc, 'sound/items/Deconstruct.ogg', 25, 1) deconstruct() @@ -76,7 +76,7 @@ if("bulb") src.icon_state = "bulb-construct-stage1" new /obj/item/stack/cable_coil(get_turf(src.loc), 1, "red") - user.visible_message("[user.name] removes the wiring from [src].", \ + user.visible_message("[user.name] removes the wiring from [src].", "You remove the wiring from [src].", "You hear a noise.") playsound(src.loc, 'sound/items/Wirecutter.ogg', 25, 1) return @@ -91,7 +91,7 @@ if("bulb") src.icon_state = "bulb-construct-stage2" src.stage = 2 - user.visible_message("[user.name] adds wires to [src].", \ + user.visible_message("[user.name] adds wires to [src].", "You add wires to [src].") return @@ -103,7 +103,7 @@ if("bulb") src.icon_state = "bulb-empty" src.stage = 3 - user.visible_message("[user.name] closes [src]'s casing.", \ + user.visible_message("[user.name] closes [src]'s casing.", "You close [src]'s casing.", "You hear a noise.") playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, 1) @@ -433,7 +433,7 @@ else if(status == LIGHT_EMPTY) if(HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER)) //If it's a screwdriver open it. playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, 1) - user.visible_message("[user.name] opens [src]'s casing.", \ + user.visible_message("[user.name] opens [src]'s casing.", "You open [src]'s casing.", "You hear a noise.") var/obj/structure/machinery/light_construct/newlight = null switch(fitting) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index e1949edec06d..04e783a63993 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -252,8 +252,8 @@ return 0 building_terminal = 0 CC.use(10) - user.visible_message(\ - SPAN_NOTICE("[user.name] has added cables to \the [src]."),\ + user.visible_message( + SPAN_NOTICE("[user.name] has added cables to \the [src]."), SPAN_NOTICE("You added cables to \the [src].")) terminal.connect_to_network() stat = 0 @@ -276,8 +276,8 @@ building_terminal = 0 return 0 new /obj/item/stack/cable_coil(loc,10) - user.visible_message(\ - SPAN_NOTICE("[user.name] cut the cables and dismantled the power terminal."),\ + user.visible_message( + SPAN_NOTICE("[user.name] cut the cables and dismantled the power terminal."), SPAN_NOTICE("You cut the cables and dismantle the power terminal.")) qdel(terminal) terminal = null diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm index 451e5e494122..981340d7abf3 100644 --- a/code/modules/projectiles/guns/shotguns.dm +++ b/code/modules/projectiles/guns/shotguns.dm @@ -859,7 +859,7 @@ can cause issues with ammo types getting mixed up during the burst. if(!do_after(H, 0.5 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) //Takes a moment to brace to fire. to_chat(H, SPAN_WARNING("You were interrupted!")) return - H.visible_message(SPAN_WARNING("[H] braces himself to fire the [initial(G.name)]."),\ + H.visible_message(SPAN_WARNING("[H] braces himself to fire the [initial(G.name)]."), SPAN_WARNING("You brace yourself to fire the [initial(G.name)].")) G.brace(H) update_button_icon() @@ -988,7 +988,7 @@ can cause issues with ammo types getting mixed up during the burst. if(flags_item & WIELDED) if(braced && !suicide) //Recoil and brief stun but nothing more. Gun is huge and you can't brace properly when shooting at extreme (same tile) close range. - user.visible_message(SPAN_WARNING("[user] rocks back under the heavy recoil of the [initial(name)]."),\ + user.visible_message(SPAN_WARNING("[user] rocks back under the heavy recoil of the [initial(name)]."), SPAN_DANGER("The [initial(name)] kicks like an elephant!")) unbrace(user) user.apply_effect(1, STUN) //Van Bandolier is a human/hero and stuns last half as long for him. @@ -1011,7 +1011,7 @@ can cause issues with ammo types getting mixed up during the burst. user.update_med_icon() //Ruh roh. - user.visible_message(SPAN_WARNING("[user] is thrown to the ground by the recoiling [initial(name)]!"),\ + user.visible_message(SPAN_WARNING("[user] is thrown to the ground by the recoiling [initial(name)]!"), SPAN_HIGHDANGER("The world breaks in half!")) shake_camera(user, RECOIL_AMOUNT_TIER_1 * 0.5, RECOIL_AMOUNT_TIER_1) @@ -1067,10 +1067,10 @@ can cause issues with ammo types getting mixed up during the burst. playsound(user.loc, "punch", 25, TRUE) var/blocker = LinkBlocked(user, start_turf, behind_turf) //returns any objects blocking the user from moving back. if(blocker) - user.visible_message(SPAN_DANGER("[user] slams into [blocker]!"),\ + user.visible_message(SPAN_DANGER("[user] slams into [blocker]!"), SPAN_DANGER("The [initial(name)]'s recoil hammers you against [blocker]!")) else - user.visible_message(SPAN_DANGER("[user] slams into an obstacle!"),\ + user.visible_message(SPAN_DANGER("[user] slams into an obstacle!"), SPAN_DANGER("The [initial(name)]'s recoil hammers you against an obstacle!")) user.apply_damage(5, BRUTE) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 1e9f712de958..700c7c3ad896 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -1251,7 +1251,7 @@ if(!P) return if(damaging && COOLDOWN_FINISHED(src, shot_cooldown)) - visible_message(SPAN_DANGER("[src] is hit by the [P.name] in the [parse_zone(P.def_zone)]!"), \ + visible_message(SPAN_DANGER("[src] is hit by the [P.name] in the [parse_zone(P.def_zone)]!"), SPAN_HIGHDANGER("[isxeno(src) ? "We" : "You"] are hit by the [P.name] in the [parse_zone(P.def_zone)]!"), null, 4, CHAT_TYPE_TAKING_HIT) COOLDOWN_START(src, shot_cooldown, 1 SECONDS) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 5807f10b27c2..bcfe4634cda1 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -45,8 +45,8 @@ if(!str || !length(str)) to_chat(usr, SPAN_WARNING(" Invalid text.")) return - user.visible_message("\The [user] titles \the [src] with \a [W], marking down: \"[str]\"",\ - SPAN_NOTICE("You title \the [src]: \"[str]\""),\ + user.visible_message("\The [user] titles \the [src] with \a [W], marking down: \"[str]\"", + SPAN_NOTICE("You title \the [src]: \"[str]\""), "You hear someone scribbling a note.") name = "[name] ([str])" if(!examtext && !nameset) @@ -64,8 +64,8 @@ update_icon() else examtext = str - user.visible_message("\The [user] labels \the [src] with \a [W], scribbling down: \"[examtext]\"",\ - SPAN_NOTICE("You label \the [src]: \"[examtext]\""),\ + user.visible_message("\The [user] labels \the [src] with \a [W], scribbling down: \"[examtext]\"", + SPAN_NOTICE("You label \the [src]: \"[examtext]\""), "You hear someone scribbling a note.") /obj/structure/bigDelivery/update_icon() @@ -152,8 +152,8 @@ if(!str || !length(str)) to_chat(usr, SPAN_WARNING(" Invalid text.")) return - user.visible_message("\The [user] titles \the [src] with \a [W], marking down: \"[str]\"",\ - SPAN_NOTICE("You title \the [src]: \"[str]\""),\ + user.visible_message("\The [user] titles \the [src] with \a [W], marking down: \"[str]\"", + SPAN_NOTICE("You title \the [src]: \"[str]\""), "You hear someone scribbling a note.") name = "[name] ([str])" if(!examtext && !nameset) @@ -172,8 +172,8 @@ update_icon() else examtext = str - user.visible_message("\The [user] labels \the [src] with \a [W], scribbling down: \"[examtext]\"",\ - SPAN_NOTICE("You label \the [src]: \"[examtext]\""),\ + user.visible_message("\The [user] labels \the [src] with \a [W], scribbling down: \"[examtext]\"", + SPAN_NOTICE("You label \the [src]: \"[examtext]\""), "You hear someone scribbling a note.") return @@ -263,8 +263,8 @@ O.add_fingerprint(usr) src.add_fingerprint(usr) src.amount-- - user.visible_message("[user] wraps [target] with [src].",\ - SPAN_NOTICE("You wrap [target], leaving [amount] units of paper on [src]."),\ + user.visible_message("[user] wraps [target] with [src].", + SPAN_NOTICE("You wrap [target], leaving [amount] units of paper on [src]."), "You hear someone taping paper around a small object.") else if (istype(target, /obj/structure/closet/crate)) var/obj/structure/closet/crate/crate = target @@ -290,8 +290,8 @@ package.wrapped = crate crate.forceMove(package) amount -= 3 - user.visible_message("[user] wraps [target] with [src].",\ - SPAN_NOTICE("You wrap [target], leaving [amount] units of paper on [src]."),\ + user.visible_message("[user] wraps [target] with [src].", + SPAN_NOTICE("You wrap [target], leaving [amount] units of paper on [src]."), "You hear someone taping paper around a large object.") else if(amount < 3) to_chat(user, SPAN_WARNING("You need more paper.")) @@ -303,8 +303,8 @@ object.welded = 1 object.forceMove(package) amount -= 3 - user.visible_message("[user] wraps [target] with [src].",\ - SPAN_NOTICE("You wrap [target], leaving [amount] units of paper on [src]."),\ + user.visible_message("[user] wraps [target] with [src].", + SPAN_NOTICE("You wrap [target], leaving [amount] units of paper on [src]."), "You hear someone taping paper around a large object.") else if(amount < 3) to_chat(user, SPAN_WARNING("You need more paper.")) diff --git a/code/modules/surgery/chestburster.dm b/code/modules/surgery/chestburster.dm index 173836a7f3e5..731ea2017b94 100644 --- a/code/modules/surgery/chestburster.dm +++ b/code/modules/surgery/chestburster.dm @@ -53,7 +53,7 @@ splash_chance -= 70 //Preds know to avoid the splashback. if(splash_chance > 0 && prob(splash_chance)) //Success! i++ - victim.visible_message(SPAN_DANGER("\The [victim] is scalded with hissing green blood!"), \ + victim.visible_message(SPAN_DANGER("\The [victim] is scalded with hissing green blood!"), SPAN_DANGER("You are splattered with sizzling blood! IT BURNS!")) if(prob(60) && !victim.stat && victim.pain.feels_pain) INVOKE_ASYNC(victim, TYPE_PROC_REF(/mob, emote), "scream") //Topkek diff --git a/code/modules/surgery/headreattach.dm b/code/modules/surgery/headreattach.dm index 80dd02b8f1cd..3f6337e75cf1 100644 --- a/code/modules/surgery/headreattach.dm +++ b/code/modules/surgery/headreattach.dm @@ -56,13 +56,13 @@ /datum/surgery_step/peel_skin/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) //No need for to-patient messages on this one, they're ghosted or in the head. - user.visible_message(SPAN_NOTICE("[user] begins to peel [target]'s neck stump open with \the [tool].") , \ + user.visible_message(SPAN_NOTICE("[user] begins to peel [target]'s neck stump open with \the [tool].") , SPAN_NOTICE("You begin to peel [target]'s neck stump open with \the [tool].")) log_interact(user, target, "[key_name(user)] began to peel back tattered skin around [key_name(target)]'s neck with \the [tool].") /datum/surgery_step/peel_skin/success(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) - user.visible_message(SPAN_NOTICE("[user] draws back the ragged flesh of [target]'s neck stump."), \ + user.visible_message(SPAN_NOTICE("[user] draws back the ragged flesh of [target]'s neck stump."), SPAN_NOTICE("You draw back the ragged flesh of [target]'s neck stump.")) surgery.affected_limb.setAmputatedTree() @@ -71,7 +71,7 @@ log_interact(user, target, "[key_name(user)] peeled back flesh where [key_name(target)]'s head used to be with \the [tool], beginning [surgery]") /datum/surgery_step/peel_skin/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) - user.visible_message(SPAN_WARNING("[user]'s hand slips, somehow damaging the flesh of [target]'s stump even worse!"), \ + user.visible_message(SPAN_WARNING("[user]'s hand slips, somehow damaging the flesh of [target]'s stump even worse!"), SPAN_WARNING("Your hand slips, somehow damaging the flesh of [target]'s stump even worse!")) log_interact(user, target, "[key_name(user)] failed to finish peeling back flesh where [key_name(target)]'s head used to be with \the [tool], aborting [surgery].") @@ -86,12 +86,12 @@ time = 10 SECONDS /datum/surgery_step/reattach_head/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) - user.visible_message(SPAN_NOTICE("[user] begins to reattach [tool] to [target]'s neck."), \ + user.visible_message(SPAN_NOTICE("[user] begins to reattach [tool] to [target]'s neck."), SPAN_NOTICE("You begin reattaching [tool] to [target]'s neck.")) log_interact(user, target, "[key_name(user)] started to attach [tool] to [key_name(target)]'s reshaped neck.") /datum/surgery_step/reattach_head/success(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, tool_type, datum/surgery/head_reattach/surgery) - user.visible_message(SPAN_NOTICE("[user] reattaches [target]'s head to the bones and musculature of \his body."), \ + user.visible_message(SPAN_NOTICE("[user] reattaches [target]'s head to the bones and musculature of \his body."), SPAN_NOTICE("You reattach [target]'s head to the bones and musculature of \his body.")) log_interact(user, target, "[key_name(user)] attached [tool] to [key_name(target)]'s neck.") @@ -108,7 +108,7 @@ target.status_flags |= PERMANENTLY_DEAD /datum/surgery_step/reattach_head/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) - user.visible_message(SPAN_WARNING("[user]'s hand slips, damaging the connectors on [target]'s neck!"), \ + user.visible_message(SPAN_WARNING("[user]'s hand slips, damaging the connectors on [target]'s neck!"), SPAN_WARNING("Your hand slips, damaging the connectors on [target]'s neck!")) log_interact(user, target, "[key_name(user)] failed to attach [tool] to [key_name(target)]'s reshaped neck.") @@ -124,19 +124,19 @@ time = 4 SECONDS /datum/surgery_step/mend_connections/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) - user.visible_message(SPAN_NOTICE("[user] begins to shape the flesh of [target]'s neck back into something anatomically recognizable with \the [tool]."), \ + user.visible_message(SPAN_NOTICE("[user] begins to shape the flesh of [target]'s neck back into something anatomically recognizable with \the [tool]."), SPAN_NOTICE("You begin to shape the flesh of [target]'s neck back into something anatomically recognizable with \the [tool].")) log_interact(user, target, "[key_name(user)] started to reshape [key_name(target)]'s head esophagal and vocal region with \the [tool].") /datum/surgery_step/mend_connections/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) - user.visible_message(SPAN_NOTICE("[user] finishes reconstructing [target]'s throat."), \ + user.visible_message(SPAN_NOTICE("[user] finishes reconstructing [target]'s throat."), SPAN_NOTICE("You finish reconstructing [target]'s throat.")) log_interact(user, target, "[key_name(user)] reshaped [key_name(target)]'s head esophagal and vocal region with \the [tool].") /datum/surgery_step/mend_connections/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) - user.visible_message(SPAN_WARNING("[user]'s hand slips, rending the flesh of [target]'s neck and throat even more!"), \ + user.visible_message(SPAN_WARNING("[user]'s hand slips, rending the flesh of [target]'s neck and throat even more!"), SPAN_WARNING("Your hand slips, rending the flesh of [target]'s neck and throat even more!")) log_interact(user, target, "[key_name(user)] failed to reshape [key_name(target)]'s head esophagal and vocal region with \the [tool].") @@ -150,12 +150,12 @@ time = 6 SECONDS /datum/surgery_step/cauterize/reposition_flesh/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) - user.visible_message(SPAN_NOTICE("[user] begins making final adjustments to the area around [target]'s neck with \the [tool]."), \ + user.visible_message(SPAN_NOTICE("[user] begins making final adjustments to the area around [target]'s neck with \the [tool]."), SPAN_NOTICE("You begin making final adjustments to the area around [target]'s neck with \the [tool].")) log_interact(user, target, "[key_name(user)] started to adjust the area around [key_name(target)]'s neck with \the [tool].") /datum/surgery_step/cauterize/reposition_flesh/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/head_reattach/surgery) - user.visible_message(SPAN_NOTICE("[user] finishes adjusting [target]'s neck."), \ + user.visible_message(SPAN_NOTICE("[user] finishes adjusting [target]'s neck."), SPAN_NOTICE("You finish adjusting [target]'s neck.")) log_interact(user, target, "[key_name(user)] adjusted the area around [key_name(target)]'s neck with \the [tool].") @@ -175,7 +175,7 @@ qdel(surgery.patient_head) //Destroy head item. /datum/surgery_step/cauterize/reposition_flesh/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) - user.visible_message(SPAN_WARNING("[user]'s hand slips, searing [target]'s neck!"), \ + user.visible_message(SPAN_WARNING("[user]'s hand slips, searing [target]'s neck!"), SPAN_WARNING("Your hand slips, searing [target]'s [surgery.affected_limb.name]!")) log_interact(user, target, "[key_name(user)] failed to adjust the area around [key_name(target)]'s neck with \the [tool].") diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index 37f3be625f1b..c1708702524a 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -108,389 +108,3 @@ and organ transplant code which may come in handy in future but haven't been edi log_interact(user, target, "[key_name(user)] failed to mend organs in [key_name(target)]'s [surgery.affected_limb.display_name], ending [surgery].") return FALSE - -/* -//----------------------------------// -// UNUPDATED LEGACY CODE // -//----------------------------------// - -/datum/surgery_step/internal/fix_organ_robotic //For artificial organs - allowed_tools = list( - /obj/item/stack/nanopaste = 100, \ - /obj/item/tool/surgery/bonegel = 30, \ - /obj/item/tool/screwdriver = 70, \ - ) - - min_duration = FIX_ORGAN_MIN_DURATION - max_duration = FIX_ORGAN_MAX_DURATION - -/datum/surgery_step/internal/fix_organ_robotic/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected, checks_only) - if(..()) - if(affected.body_part == BODY_FLAG_HEAD)//brain and eye damage is fixed by a separate surgery - return 0 - for(var/datum/internal_organ/I in affected.internal_organs) - if(I.damage > 0 && I.robotic == ORGAN_ROBOT) - return 1 - -/datum/surgery_step/internal/fix_organ_robotic/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected) - for(var/datum/internal_organ/I in affected.internal_organs) - if(I && I.damage > 0 && I.robotic == ORGAN_ROBOT) - user.visible_message(SPAN_NOTICE("[user] starts mending the damage to [target]'s [I.name]'s mechanisms."), \ - SPAN_NOTICE("You start mending the damage to [target]'s [I.name]'s mechanisms.") ) - log_interact(user, target, "[key_name(user)] started to repair damage to [key_name(target)]'s [I.name]'s mechanisms.") - - - target.custom_pain("The pain in your [affected.display_name] is living hell!", 1) - ..() - -/datum/surgery_step/internal/fix_organ_robotic/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected) - for(var/datum/internal_organ/I in affected.internal_organs) - if(I && I.damage > 0 && I.robotic == ORGAN_ROBOT) - user.visible_message(SPAN_NOTICE("[user] repairs [target]'s [I.name] with [tool]."), \ - SPAN_NOTICE("You repair [target]'s [I.name] with [tool].") ) - log_interact(user, target, "[key_name(user)] repaired damage to [key_name(target)]'s [I.name]'s mechanisms.") - I.damage = 0 - -/datum/surgery_step/internal/fix_organ_robotic/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected) - user.visible_message(SPAN_WARNING("[user]'s hand slips, gumming up the mechanisms inside of [target]'s [affected.display_name] with \the [tool]!"), \ - SPAN_WARNING("Your hand slips, gumming up the mechanisms inside of [target]'s [affected.display_name] with \the [tool]!")) - log_interact(user, target, "[key_name(user)] failed to repair damage inside of [key_name(target)]'s [affected.display_name] with \the [tool].") - - target.apply_damage(5, TOX) - affected.createwound(CUT, 5) - - for(var/datum/internal_organ/I in affected.internal_organs) - if(I) - I.take_damage(rand(3, 5), 0) - target.updatehealth() - affected.update_wounds() - - -//------------------------------------ - -/datum/surgery_step/internal/detach_organ - allowed_tools = list() - /obj/item/tool/surgery/scalpel = 100, \ - /obj/item/tool/kitchen/knife = 75, \ - /obj/item/shard = 50, \ - ) - - min_duration = SCALPEL_MIN_DURATION - max_duration = SCALPEL_MAX_DURATION - -/datum/surgery_step/internal/detach_organ/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected, checks_only) - if(!..()) - return 0 - - if(checks_only) //Second call of can_use(), just before calling end_step(). - if(affected.surgery_organ) - var/datum/internal_organ/I = target.internal_organs_by_name[affected.surgery_organ] - if(I && !I.cut_away) - return 1 - else - var/list/attached_organs = list() - for(var/organ in target.internal_organs_by_name) - var/datum/internal_organ/I = target.internal_organs_by_name[organ] - if(!I.cut_away && I.parent_limb == target_zone) - attached_organs |= organ - - var/organ_to_detach = tgui_input_list(user, "Which organ do you want to prepare for removal?", "Remove organ", attached_organs) - if(!organ_to_detach) - return 0 - if(affected.surgery_organ) - return 0 - - var/datum/internal_organ/I = target.internal_organs_by_name[organ_to_detach] - if(!I || I.cut_away) - return 0 - - if(..()) - affected.surgery_organ = organ_to_detach - return 1 - -/datum/surgery_step/internal/detach_organ/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected) - user.visible_message(SPAN_NOTICE("[user] starts to separate [target]'s [affected.surgery_organ] with \the [tool]."), \ - SPAN_NOTICE("You start to separate [target]'s [affected.surgery_organ] with \the [tool].") ) - log_interact(user, target, "[key_name(user)] started to detatch [key_name(target)]'s [affected.surgery_organ] with \the [tool].") - target.custom_pain("The pain in your [affected.display_name] is living hell!", 1) - ..() - -/datum/surgery_step/internal/detach_organ/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected) - user.visible_message(SPAN_NOTICE("[user] has separated [target]'s [affected.surgery_organ] with \the [tool].") , \ - SPAN_NOTICE("You have separated [target]'s [affected.surgery_organ] with \the [tool].")) - log_interact(user, target, "[key_name(user)] detatched [key_name(target)]'s [affected.surgery_organ] with \the [tool].") - - var/datum/internal_organ/I = target.internal_organs_by_name[affected.surgery_organ] - I.cut_away = TRUE - affected.surgery_organ = null - -/datum/surgery_step/internal/detach_organ/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected) - user.visible_message(SPAN_WARNING("[user]'s hand slips, slicing an artery inside [target]'s [affected.display_name] with \the [tool]!"), \ - SPAN_WARNING("Your hand slips, slicing an artery inside [target]'s [affected.display_name] with \the [tool]!")) - log_interact(user, target, "[key_name(user)] failed to detatch [key_name(target)]'s [affected.surgery_organ] with \the [tool].") - - affected.createwound(CUT, rand(30, 50), 1) - affected.update_wounds() - affected.surgery_organ = null - - -//------------------------------------ - -/datum/surgery_step/internal/remove_organ - allowed_tools = list() - /obj/item/tool/surgery/hemostat = 100, \ - /obj/item/tool/wirecutters = 75, \ - /obj/item/tool/kitchen/utensil/fork = 20 - ) - - min_duration = SCALPEL_MIN_DURATION - max_duration = SCALPEL_MAX_DURATION - -/datum/surgery_step/internal/remove_organ/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected, checks_only) - if(!..()) - return 0 - - if(checks_only) //Second call of can_use(), just before calling end_step(). - if(affected.surgery_organ) - var/datum/internal_organ/I = target.internal_organs_by_name[affected.surgery_organ] - if(I && I.cut_away) - return 1 - else - var/list/removable_organs = list() - for(var/organ in target.internal_organs_by_name) - var/datum/internal_organ/I = target.internal_organs_by_name[organ] - if(I.cut_away && I.parent_limb == target_zone) - removable_organs |= organ - - var/organ_to_remove = tgui_input_list(user, "Which organ do you want to remove?", "Remove organ", removable_organs) - if(!organ_to_remove) - return 0 - if(affected.surgery_organ) //already working on an organ - return 0 - - var/datum/internal_organ/I = target.internal_organs_by_name[organ_to_remove] - if(!I || !I.cut_away) - return 0 - - if(..()) - affected.surgery_organ = organ_to_remove - return 1 - -/datum/surgery_step/internal/remove_organ/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected) - user.visible_message(SPAN_NOTICE("[user] starts removing [target]'s [affected.surgery_organ] with \the [tool]."), \ - SPAN_NOTICE("You start removing [target]'s [affected.surgery_organ] with \the [tool].")) - log_interact(user, target, "[key_name(user)] started to remove [key_name(target)]'s [affected.surgery_organ] with \the [tool].") - - target.custom_pain("Someone's ripping out your [affected.surgery_organ]!", 1) - ..() - -/datum/surgery_step/internal/remove_organ/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected) - user.visible_message(SPAN_NOTICE("[user] has removed [target]'s [affected.surgery_organ] with \the [tool]."), \ - SPAN_NOTICE("You have removed [target]'s [affected.surgery_organ] with \the [tool].")) - log_interact(user, target, "[key_name(user)] removed [key_name(target)]'s [affected.surgery_organ] with \the [tool].") - - user.count_niche_stat(STATISTICS_NICHE_SURGERY_ORGAN_REMOVE) - - //Extract the organ! - if(affected.surgery_organ) - - var/datum/internal_organ/I = target.internal_organs_by_name[affected.surgery_organ] - - var/obj/item/organ/O - if(I && istype(I)) - O = I.remove(user) - if(O && istype(O)) - - //Stop the organ from continuing to reject. - O.organ_data.rejecting = null - - //Transfer over some blood - var/datum/reagent/blood/organ_blood = locate(/datum/reagent/blood) in O.reagents.reagent_list - if(!organ_blood) - target.take_blood(O, 5) - - //Kinda redundant, but I'm getting some buggy behavior. - target.internal_organs_by_name[affected.surgery_organ] = null - target.internal_organs_by_name -= affected.surgery_organ - target.internal_organs -= O.organ_data - affected.internal_organs -= O.organ_data - O.removed(target,user) - - affected.surgery_organ = null - -/datum/surgery_step/internal/remove_organ/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected) - user.visible_message(SPAN_WARNING("[user]'s hand slips, damaging the flesh in [target]'s [affected.display_name] with \the [tool]!"), \ - SPAN_WARNING("Your hand slips, damaging the flesh in [target]'s [affected.display_name] with \the [tool]!")) - log_interact(user, target, "[key_name(user)] failed to remove [key_name(target)]'s [affected.surgery_organ] with \the [tool].") - - affected.createwound(BRUISE, 20) - affected.update_wounds() - affected.surgery_organ = null - -//------------------------------------ - -/datum/surgery_step/internal/replace_organ - allowed_tools = list(/obj/item/organ = 100) - - min_duration = IMPLANT_MIN_DURATION - max_duration = IMPLANT_MAX_DURATION - -/datum/surgery_step/internal/replace_organ/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected, checks_only) - - var/obj/item/organ/O = tool - - var/organ_compatible - var/organ_missing - - if(!istype(O)) - return 0 - - if(!target.species) - to_chat(user, SPAN_WARNING("You have no idea what species this person is. Report this on the bug tracker.")) - return SPECIAL_SURGERY_INVALID - - var/o_is = (O.gender == PLURAL) ? "are" : "is" - var/o_a = (O.gender == PLURAL) ? "" : "a " - var/o_do = (O.gender == PLURAL) ? "don't" : "doesn't" - - if(target.species.has_organ[O.organ_tag]) - - if(!O.health) - to_chat(user, SPAN_WARNING("\The [O.organ_tag] [o_is] in no state to be anted.")) - return SPECIAL_SURGERY_INVALID - - if(!target.internal_organs_by_name[O.organ_tag]) - organ_missing = 1 - else - to_chat(user, SPAN_WARNING("\The [target] already has [o_a][O.organ_tag].")) - return SPECIAL_SURGERY_INVALID - - if(O.organ_data && affected.name == O.organ_data.parent_limb) - organ_compatible = 1 - else - to_chat(user, SPAN_WARNING("\The [O.organ_tag] [o_do] normally go in \the [affected.display_name].")) - return SPECIAL_SURGERY_INVALID - else - to_chat(user, SPAN_WARNING("You're pretty sure [target.species.name_plural] don't normally have [o_a][O.organ_tag].")) - return SPECIAL_SURGERY_INVALID - - return ..() && organ_missing && organ_compatible - -/datum/surgery_step/internal/replace_organ/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected) - user.visible_message(SPAN_NOTICE("[user] starts transplanting \the [tool] into [target]'s [affected.display_name]."), \ - SPAN_NOTICE("You start transplanting \the [tool] into [target]'s [affected.display_name].")) - log_interact(user, target, "[key_name(user)] started to transplant \the [tool] into [key_name(target)]'s [affected.display_name].") - - target.custom_pain("Someone's rooting around in your [affected.display_name]!", 1) - ..() - -/datum/surgery_step/internal/replace_organ/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected) - user.visible_message(SPAN_NOTICE("[user] has transplanted \the [tool] into [target]'s [affected.display_name]."), \ - SPAN_NOTICE("You have transplanted \the [tool] into [target]'s [affected.display_name].")) - log_interact(user, target, "[key_name(user)] transplanted \the [tool] into [key_name(target)]'s [affected.display_name].") - - user.temp_drop_inv_item(tool) - var/obj/item/organ/O = tool - - if(istype(O)) - - var/datum/reagent/blood/transplant_blood = locate(/datum/reagent/blood) in O.reagents.reagent_list - if(!transplant_blood) - O.organ_data.transplant_data = list() - O.organ_data.transplant_data["species"] = target.species.name - O.organ_data.transplant_data["blood_type"] = target.blood_type - else - O.organ_data.transplant_data = list() - O.organ_data.transplant_data["species"] = transplant_blood.data_properties["species"] - O.organ_data.transplant_data["blood_type"] = transplant_blood.data_properties["blood_type"] - - O.organ_data.organ_holder = null - O.organ_data.owner = target - target.internal_organs |= O.organ_data - affected.internal_organs |= O.organ_data - target.internal_organs_by_name[O.organ_tag] = O.organ_data - O.organ_data.cut_away = TRUE - O.replaced(target) - - qdel(O) - -/datum/surgery_step/internal/replace_organ/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected) - user.visible_message(SPAN_WARNING("[user]'s hand slips, damaging \the [tool]!"), \ - SPAN_WARNING("Your hand slips, damaging \the [tool]!")) - log_interact(user, target, "[key_name(user)] failed to transplant \the [tool] into [key_name(target)]'s [affected.display_name].") - - var/obj/item/organ/I = tool - if(istype(I)) - I.organ_data.take_damage(rand(3, 5), 0) - target.updatehealth() - -//------------------------------------ - -/datum/surgery_step/internal/attach_organ - allowed_tools = list( - /obj/item/tool/surgery/FixOVein = 100, \ - /obj/item/stack/cable_coil = 75 - ) - - min_duration = FIXVEIN_MIN_DURATION - max_duration = FIXVEIN_MAX_DURATION - -/datum/surgery_step/internal/attach_organ/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected, checks_only) - if(!..()) - return 0 - - if(checks_only) //Second call of can_use(), just before calling end_step(). - if(affected.surgery_organ) - var/datum/internal_organ/I = target.internal_organs_by_name[affected.surgery_organ] - if(I && I.cut_away) - return 1 - else - var/list/removable_organs = list() - for(var/organ in target.internal_organs_by_name) - var/datum/internal_organ/I = target.internal_organs_by_name[organ] - if(I.cut_away && I.parent_limb == target_zone) - removable_organs |= organ - - var/organ_to_replace = tgui_input_list(user, "Which organ do you want to reattach?", "Attach organ", removable_organs) - if(!organ_to_replace) - return 0 - - if(affected.surgery_organ) - return 0 - - var/datum/internal_organ/I = target.internal_organs_by_name[organ_to_replace] - if(!I || !I.cut_away) - return 0 - - if(..()) - affected.surgery_organ = organ_to_replace - return 1 - -/datum/surgery_step/internal/attach_organ/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected) - user.visible_message(SPAN_NOTICE("[user] begins reattaching [target]'s [affected.surgery_organ] with \the [tool]."), \ - SPAN_NOTICE("You start reattaching [target]'s [affected.surgery_organ] with \the [tool].")) - log_interact(user, target, "[key_name(user)] started to reattach [key_name(target)]'s [affected.surgery_organ] with \the [tool].") - - target.custom_pain("Someone's digging needles into your [affected.surgery_organ]!", 1) - ..() - -/datum/surgery_step/internal/attach_organ/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected) - user.visible_message(SPAN_NOTICE("[user] has reattached [target]'s [affected.surgery_organ] with \the [tool].") , \ - SPAN_NOTICE("You have reattached [target]'s [affected.surgery_organ] with \the [tool].")) - log_interact(user, target, "[key_name(user)] reattached [key_name(target)]'s [affected.surgery_organ] with \the [tool].") - - user.count_niche_stat(STATISTICS_NICHE_SURGERY_ORGAN_ATTACH) - - var/datum/internal_organ/I = target.internal_organs_by_name[affected.surgery_organ] - I.cut_away = FALSE - affected.surgery_organ = null - -/datum/surgery_step/internal/attach_organ/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, obj/limb/affected) - user.visible_message(SPAN_WARNING("[user]'s hand slips, damaging the flesh in [target]'s [affected.display_name] with \the [tool]!"), \ - SPAN_WARNING("Your hand slips, damaging the flesh in [target]'s [affected.display_name] with \the [tool]!")) - log_interact(user, target, "[key_name(user)] failed to reattach [key_name(target)]'s [affected.surgery_organ] with \the [tool].") - - affected.createwound(BRUISE, 20) - affected.update_wounds() - affected.surgery_organ = null -*/ diff --git a/code/modules/tents/deployed_tents.dm b/code/modules/tents/deployed_tents.dm index 5f74337f9973..e9bc47549a84 100644 --- a/code/modules/tents/deployed_tents.dm +++ b/code/modules/tents/deployed_tents.dm @@ -89,7 +89,7 @@ health -= rand(M.melee_damage_lower, M.melee_damage_upper) playsound(src, 'sound/items/paper_ripped.ogg', 25, 1) - M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] [src]!"), \ + M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] [src]!"), SPAN_DANGER("You [M.slash_verb] [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) if(health <= 0) diff --git a/code/modules/tents/folded_tents.dm b/code/modules/tents/folded_tents.dm index 6496810f1a85..693367e400f5 100644 --- a/code/modules/tents/folded_tents.dm +++ b/code/modules/tents/folded_tents.dm @@ -107,7 +107,7 @@ for(var/turf/turf in deployment_area) turf_overlay += new /obj/effect/overlay/temp/tent_deployment_area/casting(turf) - user.visible_message(SPAN_INFO("[user] starts deploying [src]..."), \ + user.visible_message(SPAN_INFO("[user] starts deploying [src]..."), SPAN_WARNING("You start assembling [src]... Stand still, it might take a bit to figure it out...")) if(!do_after(user, 6 SECONDS, INTERRUPT_ALL, BUSY_ICON_BUILD)) to_chat(user, SPAN_WARNING("You were interrupted!")) diff --git a/code/modules/vehicles/multitile/multitile_interaction.dm b/code/modules/vehicles/multitile/multitile_interaction.dm index b3aa9c67bbb2..2967a27aa9e1 100644 --- a/code/modules/vehicles/multitile/multitile_interaction.dm +++ b/code/modules/vehicles/multitile/multitile_interaction.dm @@ -270,11 +270,11 @@ //Somehow we will deal no damage on this attack if(!damage) playsound(X.loc, 'sound/weapons/alien_claw_swipe.ogg', 25, 1) - X.visible_message(SPAN_DANGER("\The [X] swipes at \the [src] to no effect!"), \ + X.visible_message(SPAN_DANGER("\The [X] swipes at \the [src] to no effect!"), SPAN_DANGER("We swipe at \the [src] to no effect!")) return XENO_ATTACK_ACTION - X.visible_message(SPAN_DANGER("\The [X] slashes \the [src]!"), \ + X.visible_message(SPAN_DANGER("\The [X] slashes \the [src]!"), SPAN_DANGER("We slash \the [src]!")) playsound(X.loc, pick('sound/effects/metalhit.ogg', 'sound/weapons/alien_claw_metal1.ogg', 'sound/weapons/alien_claw_metal2.ogg', 'sound/weapons/alien_claw_metal3.ogg'), 25, 1) diff --git a/code/modules/vehicles/powerloader.dm b/code/modules/vehicles/powerloader.dm index 6992269c7566..09b44b63a280 100644 --- a/code/modules/vehicles/powerloader.dm +++ b/code/modules/vehicles/powerloader.dm @@ -84,7 +84,7 @@ /obj/vehicle/powerloader/attack_hand(mob/user) if(buckled_mob && user != buckled_mob) - buckled_mob.visible_message(SPAN_WARNING("[user] tries to move [buckled_mob] out of [src]."),\ + buckled_mob.visible_message(SPAN_WARNING("[user] tries to move [buckled_mob] out of [src]."), SPAN_DANGER("[user] tries to move you out of [src]!")) var/oldloc = loc var/olddir = dir